fixed #129 - drag stucks on no-container release

luckylooke · Mar 27, 2017 · cdf6632 · cdf6632
1 parent 4449b0a
commit cdf6632
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/changelog.markdown b/changelog.markdown
@@ -4,6 +4,7 @@
 
 # 4.3.3
 - fixed #131 drags mixed with scrolling (caused by chrome update)
+- fixed #129 drag stucks on no-container release
 
 # 4.3.2 War of the Worlds
 - fixed #120 isContainer example not working

diff --git a/docs/dist/examples.js b/docs/dist/examples.js
diff --git a/docs/dist/examples.min.js b/docs/dist/examples.min.js
diff --git a/docs/dist/examples.min.js.map b/docs/dist/examples.min.js.map
diff --git a/docs/src/examples/templates.js b/docs/src/examples/templates.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -208,10 +208,12 @@ gulp.task('templates:docs', function() {
 */
 gulp.task('watch', ['serve'], function() {
   gulp.watch(config.dragular.styles,  ['styles']);
-  gulp.watch(config.docs.scripts,  ['scripts']);
+  gulp.watch(config.dragular.scripts,  ['scripts']);
 });
 
 gulp.task('watch:docs', ['serve'], function() {
+  gulp.watch(config.dragular.styles,  ['styles']);
+  gulp.watch(config.dragular.scripts,  ['scripts']);
   gulp.watch(config.docs.styles,  ['styles']);
   gulp.watch(config.docs.scripts,  ['scripts']);
   gulp.watch(config.docs.templates,  ['templates:docs']);

diff --git a/src/dragularService.js b/src/dragularService.js
@@ -538,7 +538,7 @@ var dragularService = function ($rootScope, $compile) {
       }
 
       if (shared.sourceModel && !isInitialPlacement(target)) {
-        if (shared.targetCtx.fm){ // target has filtered model
+        if (shared.targetCtx && shared.targetCtx.fm){ // target has filtered model
           // convert index from index-in-filteredModel to index-in-model
           dropIndex = shared.targetCtx.m.indexOf(shared.targetCtx.fm[dropIndex]);
         }
@@ -556,7 +556,7 @@ var dragularService = function ($rootScope, $compile) {
             shared.dropElmModel = shared.copy && !o.dontCopyModel ? angular.copy(shared.sourceModel[shared.initialIndex]) : shared.sourceModel[shared.initialIndex];
 
             if (!shared.tempModel) {
-              shared.targetModel = shared.targetCtx.m;
+              shared.targetModel = ( shared.targetCtx && shared.targetCtx.m ) || shared.sourceModel;
             } else {
               shared.targetModel = shared.tempModel;
             }
@@ -717,7 +717,7 @@ var dragularService = function ($rootScope, $compile) {
 
           while (i--) { // for each namespace
               nameSpace = o.nameSpace[i];
-            if (shared.containers[nameSpace].indexOf(target) !== -1) {
+            if (shared.containers[nameSpace].indexOf(target) != -1) {
               targetCtx = getTargetCtx(nameSpace);
               break;
             }