angular-ui · wuliupo · wuliupo · wuliupo · Jul 20, 2016 · wuliupo
diff --git a/src/sortable.js b/src/sortable.js
@@ -20,119 +20,114 @@ angular.module('ui.sortable', [])
          uiSortable: '='
        },
        link: function(scope, element, attrs, ngModel) {
+          'use strict';
diff --git a/src/sortable.js b/src/sortable.js

            // update changed options
            angular.forEach(newVal, function(value, key) {
              // if it's a custom option of the directive,
              // handle it approprietly
-              if (key in directiveOpts) {
+              if (directiveOpts[key]) {
diff --git a/src/sortable.js b/src/sortable.js
@@ -381,7 +342,7 @@ angular.module('ui.sortable', [])
              } else {
                // if the item was not moved, then restore the elements
                // so that the ngRepeat's comment are correct.
-                if ((!('dropindex' in ui.item.sortable) || ui.item.sortable.isCanceled()) &&
+                if ((!ui.item.sortable.dropindex || ui.item.sortable.isCanceled()) &&
diff --git a/src/sortable.js b/src/sortable.js
-              }
-              optsDiff[key] = value;
-              opts[key] = value;
+              opts[key] = optsDiff[key] = patchSortableOption(key, value);
diff --git a/src/sortable.js b/src/sortable.js
                }
-              });
-            }
+                opts[key] = optsDiff[key] = patchSortableOption(key, defaultOptions[key]);
diff --git a/src/sortable.js b/src/sortable.js
              }
              // wrap the callback
              value = combineCallbacks(callbacks[key], value);
-            } else if (wrappers[key]) {
-              value = wrappers[key](value);
+            } else if ( key === 'helper' && typeof value === 'function') {
diff --git a/src/sortable.js b/src/sortable.js
+                value = combineCallbacks(value, function (e, ui) {
+                  // call apply after stop
+                  scope.$apply();
+                  ui.item.sortable._destroy();