From 2d98628524ff513479bf1fba7e24a2669e2a3fc2 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sat, 13 May 2017 02:51:35 +0200 Subject: [PATCH] Fix sorter for layers in style manager --- src/style_manager/view/LayersView.js | 1 + src/utils/Sorter.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/style_manager/view/LayersView.js b/src/style_manager/view/LayersView.js index 7aba93c74..5c28afd17 100644 --- a/src/style_manager/view/LayersView.js +++ b/src/style_manager/view/LayersView.js @@ -26,6 +26,7 @@ define(['backbone','./LayerView'], pfx: this.config.pStylePrefix, }) : ''; + this.$el.data('model', {}); this.$el.data('collection', this.collection); }, diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js index 6cf9feea2..e40a245ef 100644 --- a/src/utils/Sorter.js +++ b/src/utils/Sorter.js @@ -629,7 +629,7 @@ define(function(require) { var model = $(src).data('model'); var $dst = $(dst); var targetModel; - + console.log($dst, $dst.data('collection')); while ($dst.length && !targetModel) { targetModel = $dst.data('model'); dst = $dst.get(0); @@ -642,7 +642,7 @@ define(function(require) { } var targetCollection = $dst.data('collection'); - + console.log(targetCollection, $dst); // Check if the elemenet is DRAGGABLE to the target var drag = model && model.get('draggable'); var draggable = typeof drag !== 'undefined' ? drag : 1; @@ -669,7 +669,7 @@ define(function(require) { // Check if the target could accept the element to be DROPPED inside var accepted = 1; - var droppable = targetModel ? targetModel.get('droppable') : 1; + var droppable = targetModel && targetModel.get ? targetModel.get('droppable') : 1; var toDrop = draggable; if(droppable instanceof Array) { // When I drag blocks src is the HTMLElement of the block