+ support debugInfoEnabled(false)

ng-sortable.js

@@ -23,61 +23,60 @@
 	 * @property  {number}        newIndex   after sort
 	 */
 
+	var expando = 'Sortable:ng-sortable';
 
 	angular.module('ng-sortable', [])
-		.constant('ngSortableVersion', '0.3.7')
+		.constant('ngSortableVersion', '0.4.0')
 		.constant('ngSortableConfig', {})
 		.directive('ngSortable', ['$parse', 'ngSortableConfig', function ($parse, ngSortableConfig) {
 			var removed,
-				nextSibling;
+				nextSibling,
-				
+				getSourceFactory = function getSourceFactory(el, scope) {
-			// Export
+					var ngRepeat = [].filter.call(el.childNodes, function (node) {
-			return {
+						return (
-				restrict: 'AC',
+								(node.nodeType === 8) &&
-				scope: { ngSortable: "=?" },
+								(node.nodeValue.indexOf('ngRepeat:') !== -1)
-				link: function (scope, $el, attrs) {
+							);
+					})[0];
+
+					if (!ngRepeat) {
+						// Without ng-repeat
+						return null;
+					}
 
-					function getSource(el) {
+					// tests: http://jsbin.com/kosubutilo/1/edit?js,output
-						var ngRepeat = [].filter.call(el.childNodes, function (node) {
+					ngRepeat = ngRepeat.nodeValue.match(/ngRepeat:\s*(?:\(.*?,\s*)?([^\s)]+)[\s)]+in\s+([^\s|]+)/);
-							return (
-									(node.nodeType === 8) &&
-									(node.nodeValue.indexOf('ngRepeat:') !== -1)
-								);
-						})[0];
 
-						if (!ngRepeat) {
+					var itemsExpr = $parse(ngRepeat[2]);
-							// Without ng-repeat
-							return null;
-						}
 
-						// tests: http://jsbin.com/kosubutilo/1/edit?js,output
+					return function () {
-						ngRepeat = ngRepeat.nodeValue.match(/ngRepeat:\s*(?:\(.*?,\s*)?([^\s)]+)[\s)]+in\s+([^\s|]+)/);
+						return itemsExpr(scope.$parent) || [];
+					};
+				};
 
-						var itemExpr = $parse(ngRepeat[1]);
-						var itemsExpr = $parse(ngRepeat[2]);
-		
-						return {
-							items: function () {
-								return itemsExpr(scope);
-							}
-						};
-					}
 
+			// Export
+			return {
+				restrict: 'AC',
+				scope: { ngSortable: "=?" },
+				link: function (scope, $el) {
 					var el = $el[0],
 						options = angular.extend(scope.ngSortable || {}, ngSortableConfig),
-						source = getSource(el),
 						watchers = [],
+						getSource = getSourceFactory(el, scope),
 						sortable
 					;
 
+					el[expando] = getSource;
 
 					function _emitEvent(/**Event*/evt, /*Mixed*/item) {
 						var name = 'on' + evt.type.charAt(0).toUpperCase() + evt.type.substr(1);
+						var source = getSource();
 
 						/* jshint expr:true */
 						options[name] && options[name]({
-							model: item || source && source.items()[evt.newIndex],
+							model: item || source[evt.newIndex],
-							models: source && source.items(),
+							models: source,
 							oldIndex: evt.oldIndex,
 							newIndex: evt.newIndex
 						});
@@ -85,25 +84,25 @@
 
 
 					function _sync(/**Event*/evt) {
-						if (!source) {
+						var items = getSource();
+
+						if (!items) {
 							// Without ng-repeat
 							return;
 						}
 
 						var oldIndex = evt.oldIndex,
-							newIndex = evt.newIndex,
+							newIndex = evt.newIndex;
-							items = source.items();
 
 						if (el !== evt.from) {
-							var prevSource = getSource(evt.from),
+							var prevItems = evt.from[expando]();
-								prevItems = prevSource.items();
 
-							oldIndex = prevItems.indexOf(prevSource.item(evt.item));
 							removed = prevItems[oldIndex];
 
 							if (evt.clone) {
-								evt.from.removeChild(evt.clone);
 								removed = angular.copy(removed);
+								prevItems.splice(Sortable.utils.index(evt.clone), 0, prevItems.splice(oldIndex, 1)[0]);
+								evt.from.removeChild(evt.clone);
 							}
 							else {
 								prevItems.splice(oldIndex, 1);
@@ -155,7 +154,11 @@
 						angular.forEach(watchers, function (/** Function */unwatch) {
 							unwatch();
 						});
+
 						sortable.destroy();
+
+						el[expando] = null;
+						el = null;
 						watchers = null;
 						sortable = null;
 						nextSibling = null;