|
|
|
@ -35,169 +35,174 @@ |
|
|
|
.constant('ngSortableConfig', {}) |
|
|
|
.constant('ngSortableConfig', {}) |
|
|
|
.directive('ngSortable', ['$parse', 'ngSortableConfig', function ($parse, ngSortableConfig) { |
|
|
|
.directive('ngSortable', ['$parse', 'ngSortableConfig', function ($parse, ngSortableConfig) { |
|
|
|
var removed, |
|
|
|
var removed, |
|
|
|
nextSibling, |
|
|
|
nextSibling; |
|
|
|
getSourceFactory = function getSourceFactory(el, scope) { |
|
|
|
|
|
|
|
var ngRepeat = [].filter.call(el.childNodes, function (node) { |
|
|
|
// Export
|
|
|
|
|
|
|
|
return { |
|
|
|
|
|
|
|
restrict: 'AC', |
|
|
|
|
|
|
|
scope: { ngSortable: "=?" }, |
|
|
|
|
|
|
|
priority: 1001, |
|
|
|
|
|
|
|
compile: function ($element, $attr) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var ngRepeat = [].filter.call($element[0].childNodes, function (node) { |
|
|
|
return ( |
|
|
|
return ( |
|
|
|
(node.nodeType === 8) && |
|
|
|
(node.nodeType === 1) && |
|
|
|
(node.nodeValue.indexOf('ngRepeat:') !== -1) |
|
|
|
(node.attributes['ng-repeat']) |
|
|
|
); |
|
|
|
); |
|
|
|
})[0]; |
|
|
|
})[0]; |
|
|
|
|
|
|
|
|
|
|
|
if (!ngRepeat) { |
|
|
|
if (!ngRepeat) { |
|
|
|
// Without ng-repeat
|
|
|
|
return; |
|
|
|
return function () { |
|
|
|
|
|
|
|
return null; |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// tests: http://jsbin.com/kosubutilo/1/edit?js,output
|
|
|
|
var expression = ngRepeat.attributes['ng-repeat'].nodeValue; |
|
|
|
ngRepeat = ngRepeat.nodeValue.match(/ngRepeat:\s*(?:\(.*?,\s*)?([^\s)]+)[\s)]+in\s+([^\s|]+)/); |
|
|
|
var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/); |
|
|
|
|
|
|
|
|
|
|
|
var itemsExpr = $parse(ngRepeat[2]); |
|
|
|
if (!match) { |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return function () { |
|
|
|
var rhs = match[2]; |
|
|
|
return itemsExpr(scope.$parent) || []; |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return function postLink(scope, $el) { |
|
|
|
|
|
|
|
var itemsExpr = $parse(rhs); |
|
|
|
|
|
|
|
var getSource = function getSource() { |
|
|
|
|
|
|
|
return itemsExpr(scope.$parent) || []; |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// Export
|
|
|
|
|
|
|
|
return { |
|
|
|
|
|
|
|
restrict: 'AC', |
|
|
|
|
|
|
|
scope: { ngSortable: "=?" }, |
|
|
|
|
|
|
|
link: function (scope, $el) { |
|
|
|
|
|
|
|
var el = $el[0], |
|
|
|
|
|
|
|
options = angular.extend(scope.ngSortable || {}, ngSortableConfig), |
|
|
|
|
|
|
|
watchers = [], |
|
|
|
|
|
|
|
getSource = getSourceFactory(el, scope), |
|
|
|
|
|
|
|
offDestroy, |
|
|
|
|
|
|
|
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[evt.newIndex], |
|
|
|
|
|
|
|
models: source, |
|
|
|
|
|
|
|
oldIndex: evt.oldIndex, |
|
|
|
|
|
|
|
newIndex: evt.newIndex, |
|
|
|
|
|
|
|
originalEvent: evt |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var el = $el[0], |
|
|
|
|
|
|
|
options = angular.extend(scope.ngSortable || {}, ngSortableConfig), |
|
|
|
|
|
|
|
watchers = [], |
|
|
|
|
|
|
|
offDestroy, |
|
|
|
|
|
|
|
sortable |
|
|
|
|
|
|
|
; |
|
|
|
|
|
|
|
|
|
|
|
function _sync(/**Event*/evt) { |
|
|
|
el[expando] = getSource; |
|
|
|
var items = getSource(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!items) { |
|
|
|
function _emitEvent(/**Event*/evt, /*Mixed*/item) { |
|
|
|
// Without ng-repeat
|
|
|
|
var name = 'on' + evt.type.charAt(0).toUpperCase() + evt.type.substr(1); |
|
|
|
return; |
|
|
|
var source = getSource(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var oldIndex = evt.oldIndex, |
|
|
|
/* jshint expr:true */ |
|
|
|
newIndex = evt.newIndex; |
|
|
|
options[name] && options[name]({ |
|
|
|
|
|
|
|
model: item || source[evt.newIndex], |
|
|
|
|
|
|
|
models: source, |
|
|
|
|
|
|
|
oldIndex: evt.oldIndex, |
|
|
|
|
|
|
|
newIndex: evt.newIndex, |
|
|
|
|
|
|
|
originalEvent: evt |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (el !== evt.from) { |
|
|
|
|
|
|
|
var prevItems = evt.from[expando](); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
removed = prevItems[oldIndex]; |
|
|
|
function _sync(/**Event*/evt) { |
|
|
|
|
|
|
|
var items = getSource(); |
|
|
|
|
|
|
|
|
|
|
|
if (evt.clone) { |
|
|
|
if (!items) { |
|
|
|
removed = angular.copy(removed); |
|
|
|
// Without ng-repeat
|
|
|
|
prevItems.splice(Sortable.utils.index(evt.clone, sortable.options.draggable), 0, prevItems.splice(oldIndex, 1)[0]); |
|
|
|
return; |
|
|
|
evt.from.removeChild(evt.clone); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
prevItems.splice(oldIndex, 1); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
items.splice(newIndex, 0, removed); |
|
|
|
var oldIndex = evt.oldIndex, |
|
|
|
|
|
|
|
newIndex = evt.newIndex; |
|
|
|
|
|
|
|
|
|
|
|
evt.from.insertBefore(evt.item, nextSibling); // revert element
|
|
|
|
if (el !== evt.from) { |
|
|
|
} |
|
|
|
var prevItems = evt.from[expando](); |
|
|
|
else { |
|
|
|
|
|
|
|
items.splice(newIndex, 0, items.splice(oldIndex, 1)[0]); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// move ng-repeat comment node to right position
|
|
|
|
removed = prevItems[oldIndex]; |
|
|
|
if (nextSibling.nodeType === Node.COMMENT_NODE) { |
|
|
|
|
|
|
|
evt.from.insertBefore(nextSibling, evt.item.nextSibling); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
scope.$apply(); |
|
|
|
if (evt.clone) { |
|
|
|
} |
|
|
|
removed = angular.copy(removed); |
|
|
|
|
|
|
|
prevItems.splice(Sortable.utils.index(evt.clone, sortable.options.draggable), 0, prevItems.splice(oldIndex, 1)[0]); |
|
|
|
|
|
|
|
evt.from.removeChild(evt.clone); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
prevItems.splice(oldIndex, 1); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function _destroy() { |
|
|
|
items.splice(newIndex, 0, removed); |
|
|
|
offDestroy(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
angular.forEach(watchers, function (/** Function */unwatch) { |
|
|
|
evt.from.insertBefore(evt.item, nextSibling); // revert element
|
|
|
|
unwatch(); |
|
|
|
} |
|
|
|
}); |
|
|
|
else { |
|
|
|
|
|
|
|
items.splice(newIndex, 0, items.splice(oldIndex, 1)[0]); |
|
|
|
|
|
|
|
|
|
|
|
sortable.destroy(); |
|
|
|
// move ng-repeat comment node to right position
|
|
|
|
|
|
|
|
if (nextSibling.nodeType === Node.COMMENT_NODE) { |
|
|
|
|
|
|
|
evt.from.insertBefore(nextSibling, evt.item.nextSibling); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
el[expando] = null; |
|
|
|
scope.$apply(); |
|
|
|
el = null; |
|
|
|
} |
|
|
|
watchers = null; |
|
|
|
|
|
|
|
sortable = null; |
|
|
|
|
|
|
|
nextSibling = null; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function _destroy() { |
|
|
|
|
|
|
|
offDestroy(); |
|
|
|
|
|
|
|
|
|
|
|
// Initialization
|
|
|
|
angular.forEach(watchers, function (/** Function */unwatch) { |
|
|
|
sortable = Sortable.create(el, Object.keys(options).reduce(function (opts, name) { |
|
|
|
unwatch(); |
|
|
|
opts[name] = opts[name] || options[name]; |
|
|
|
}); |
|
|
|
return opts; |
|
|
|
|
|
|
|
}, { |
|
|
|
sortable.destroy(); |
|
|
|
onStart: function (/**Event*/evt) { |
|
|
|
|
|
|
|
nextSibling = evt.from === evt.item.parentNode ? evt.item.nextSibling : evt.clone.nextSibling; |
|
|
|
el[expando] = null; |
|
|
|
_emitEvent(evt); |
|
|
|
el = null; |
|
|
|
scope.$apply(); |
|
|
|
watchers = null; |
|
|
|
}, |
|
|
|
sortable = null; |
|
|
|
onEnd: function (/**Event*/evt) { |
|
|
|
nextSibling = null; |
|
|
|
_emitEvent(evt, removed); |
|
|
|
|
|
|
|
scope.$apply(); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onAdd: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_sync(evt); |
|
|
|
|
|
|
|
_emitEvent(evt, removed); |
|
|
|
|
|
|
|
scope.$apply(); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onUpdate: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_sync(evt); |
|
|
|
|
|
|
|
_emitEvent(evt); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onRemove: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_emitEvent(evt, removed); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onSort: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_emitEvent(evt); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Create watchers for `options`
|
|
|
|
// Initialization
|
|
|
|
angular.forEach([ |
|
|
|
sortable = Sortable.create(el, Object.keys(options).reduce(function (opts, name) { |
|
|
|
'sort', 'disabled', 'draggable', 'handle', 'animation', 'group', 'ghostClass', 'filter', |
|
|
|
opts[name] = opts[name] || options[name]; |
|
|
|
'onStart', 'onEnd', 'onAdd', 'onUpdate', 'onRemove', 'onSort', 'onMove', 'onClone', 'setData' |
|
|
|
return opts; |
|
|
|
], function (name) { |
|
|
|
}, { |
|
|
|
watchers.push(scope.$watch('ngSortable.' + name, function (value) { |
|
|
|
onStart: function (/**Event*/evt) { |
|
|
|
if (value !== void 0) { |
|
|
|
nextSibling = evt.from === evt.item.parentNode ? evt.item.nextSibling : evt.clone.nextSibling; |
|
|
|
options[name] = value; |
|
|
|
_emitEvent(evt); |
|
|
|
|
|
|
|
scope.$apply(); |
|
|
|
if (!/^on[A-Z]/.test(name)) { |
|
|
|
}, |
|
|
|
sortable.option(name, value); |
|
|
|
onEnd: function (/**Event*/evt) { |
|
|
|
} |
|
|
|
_emitEvent(evt, removed); |
|
|
|
|
|
|
|
scope.$apply(); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onAdd: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_sync(evt); |
|
|
|
|
|
|
|
_emitEvent(evt, removed); |
|
|
|
|
|
|
|
scope.$apply(); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onUpdate: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_sync(evt); |
|
|
|
|
|
|
|
_emitEvent(evt); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onRemove: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_emitEvent(evt, removed); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onSort: function (/**Event*/evt) { |
|
|
|
|
|
|
|
_emitEvent(evt); |
|
|
|
} |
|
|
|
} |
|
|
|
})); |
|
|
|
})); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
offDestroy = scope.$on('$destroy', _destroy); |
|
|
|
// Create watchers for `options`
|
|
|
|
|
|
|
|
angular.forEach([ |
|
|
|
|
|
|
|
'sort', 'disabled', 'draggable', 'handle', 'animation', 'group', 'ghostClass', 'filter', |
|
|
|
|
|
|
|
'onStart', 'onEnd', 'onAdd', 'onUpdate', 'onRemove', 'onSort', 'onMove', 'onClone', 'setData' |
|
|
|
|
|
|
|
], function (name) { |
|
|
|
|
|
|
|
watchers.push(scope.$watch('ngSortable.' + name, function (value) { |
|
|
|
|
|
|
|
if (value !== void 0) { |
|
|
|
|
|
|
|
options[name] = value; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!/^on[A-Z]/.test(name)) { |
|
|
|
|
|
|
|
sortable.option(name, value); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
})); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
offDestroy = scope.$on('$destroy', _destroy); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
}]); |
|
|
|
}]); |
|
|
|
|
Lebedev Konstantin
9 years ago