+ merge 'dev'

10 years ago · 4cd67d6107
12 changed files with 74 additions and 50 deletions
--- a/.jshintrc
+++ b/.jshintrc
@ -1,9 +1,9 @@
 {
 	"strict": true,
-	"newcap": false,	// "Tolerate uncapitalized constructors"
+	"newcap": false,
 	"node": true,
-	"expr": true,	// - true && call() "Expected an assignment or function call and instead saw an expression."
-	"supernew": true,	// - "Missing '()' invoking a constructor."
+	"expr": true,
+	"supernew": true,
 	"laxbreak": true,
 	"white": true,
 	"globals": {
--- a/Gruntfile.js
+++ b/Gruntfile.js
--- a/README.md
+++ b/README.md
@ -202,7 +202,7 @@ Sortable.create(list, {
 #### `ghostClass` option
 Class name for the drop placeholder.

-Demo: http://jsbin.com/boqugumiqi/1/edit?css,js,output
+Demo: http://jsbin.com/hunifu/1/edit?css,js,output

 ```css
 .ghost {
--- a/Sortable.js
+++ b/Sortable.js
@ -171,13 +171,15 @@


 		_dragStarted: function () {
-			// Apply effect
-			_toggleClass(dragEl, this.options.ghostClass, true);
+			if (rootEl && dragEl) {
+				// Apply effect
+				_toggleClass(dragEl, this.options.ghostClass, true);

-			Sortable.active = this;
+				Sortable.active = this;

-			// Drag start event
-			_dispatchEvent(rootEl, 'start', dragEl, rootEl, oldIndex);
+				// Drag start event
+				_dispatchEvent(rootEl, 'start', dragEl, rootEl, oldIndex);
+			}
 		},


@ -276,13 +278,6 @@
 					}
 				} catch (err) {
 				}
-
-
-				if (activeGroup.pull == 'clone') {
-					cloneEl = dragEl.cloneNode(true);
-					_css(cloneEl, 'display', 'none');
-					rootEl.insertBefore(cloneEl, dragEl);
-				}
 			}
 		},

@ -347,6 +342,12 @@

 			this._offUpEvents();

+			if (activeGroup.pull == 'clone') {
+				cloneEl = dragEl.cloneNode(true);
+				_css(cloneEl, 'display', 'none');
+				rootEl.insertBefore(cloneEl, dragEl);
+			}
+
 			if (isTouch) {
 				var rect = dragEl.getBoundingClientRect(),
 					css = _css(dragEl),
@ -470,7 +471,7 @@
 				!options.dragoverBubble && evt.stopPropagation();
 			}

-			if (!_silent && activeGroup &&
+			if (!_silent && activeGroup && !options.disabled &&
 				(isOwner
 					? canSort || (revert = !rootEl.contains(dragEl))
 					: activeGroup.pull && groupPut && (
@ -627,16 +628,18 @@
 						// Remove event
 						_dispatchEvent(rootEl, 'remove', dragEl, rootEl, oldIndex, newIndex);
 					}
-					else if (dragEl.nextSibling !== nextEl) {
-						// (1) Remove clone
+					else {
+						// Remove clone
 						cloneEl && cloneEl.parentNode.removeChild(cloneEl);

- 						// (2) Get the index of the dragged element within its parent
-						newIndex = _index(dragEl);
+						if (dragEl.nextSibling !== nextEl) {
+							// Get the index of the dragged element within its parent
+							newIndex = _index(dragEl);

-						// drag & drop within the same list
-						_dispatchEvent(rootEl, 'update', dragEl, rootEl, oldIndex, newIndex);
-						_dispatchEvent(rootEl, 'sort', dragEl, rootEl, oldIndex, newIndex);
+							// drag & drop within the same list
+							_dispatchEvent(rootEl, 'update', dragEl, rootEl, oldIndex, newIndex);
+							_dispatchEvent(rootEl, 'sort', dragEl, rootEl, oldIndex, newIndex);
+						}
 					}

 					// Drag end event
@ -820,7 +823,7 @@
 			do {
 				if (
 					(tag === '>*' && el.parentNode === ctx) || (
-						(tag === '' || el.nodeName == tag) &&
+						(tag === '' || el.nodeName.toUpperCase() == tag) &&
 						(!selector.length || ((' ' + el.className + ' ').match(re) || []).length == selector.length)
 					)
 				) {
@ -948,8 +951,10 @@
 	 */
 	function _index(/**HTMLElement*/el) {
 		var index = 0;
-		while (el && (el = el.previousElementSibling) && (el.nodeName !== 'TEMPLATE')) {
-			index++;
+		while (el && (el = el.previousElementSibling)) {
+			if (el.nodeName.toUpperCase() !== 'TEMPLATE') {
+				index++;
+			}
 		}
 		return index;
 	}
@ -994,7 +999,7 @@
 	};


-	Sortable.version = '1.0.0';
+	Sortable.version = '1.0.1';


 	/**
--- a/Sortable.min.js
+++ b/Sortable.min.js
--- a/bower.json
+++ b/bower.json
@ -1,7 +1,7 @@
 {
  "name": "Sortable",
  "main": "Sortable.js",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "homepage": "http://rubaxa.github.io/Sortable/",
  "authors": [
    "RubaXa <ibnRubaXa@gmail.com>"
--- a/component.json
+++ b/component.json
@ -1,7 +1,7 @@
 {
  "name": "Sortable",
  "main": "Sortable.js",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "homepage": "http://rubaxa.github.io/Sortable/",
  "repo": "RubaXa/Sortable",
  "authors": [
--- a/index.html
+++ b/index.html
@ -128,7 +128,7 @@
 			</div>

 			<div style="width: 25%; float: left; margin-top: 15px; margin-left: 10px" class="block__list block__list_words">
-				<div class="block__list-title">only pull (clone), no reordering</div>
+				<div class="block__list-title">only pull (clone) no&nbsp;reordering</div>
 				<ul id="advanced-2">
 					<li>Sex</li>
 					<li>Drugs</li>
--- a/meteor/package.js
+++ b/meteor/package.js
@ -16,7 +16,7 @@ Package.describe({
 Package.onUse(function (api) {
 	api.versionsFrom(['METEOR@0.9.0', 'METEOR@1.0']);
 	api.use('templating', 'client');
-	api.use('dburles:mongo-collection-instances@0.2.5');  // to watch collections getting created
+	api.use('dburles:mongo-collection-instances@0.2.6');  // to watch collections getting created
 	api.export('Sortable');
 	api.addFiles([
 		'Sortable.js',
--- a/ng-sortable.js
+++ b/ng-sortable.js
@ -15,9 +15,10 @@
 	'use strict';

 	angular.module('ng-sortable', [])
-		.constant('$version', '0.3.2')
+		.constant('$version', '0.3.5')
 		.directive('ngSortable', ['$parse', function ($parse) {
-			var removed;
+			var removed,
+				nextSibling;

 			function getSource(el) {
 				var scope = angular.element(el).scope();
@ -27,7 +28,9 @@
 							(node.nodeValue.indexOf('ngRepeat:') !== -1)
 						);
 				})[0];
-				ngRepeat = ngRepeat.nodeValue.match(/ngRepeat:\s*([^\s]+)\s+in\s+([^\s|]+)/);
+
+				// tests: http://jsbin.com/kosubutilo/1/edit?js,output
+				ngRepeat = ngRepeat.nodeValue.match(/ngRepeat:\s*(?:\(.*?,\s*)?([^\s)]+)[\s)]+in\s+([^\s|]+)/);

 				var itemExpr = $parse(ngRepeat[1]);
 				var itemsExpr = $parse(ngRepeat[2]);
@ -70,19 +73,21 @@
 								prevItems = prevSource.items();

 							oldIndex = prevItems.indexOf(prevSource.item(evt.item));
-							removed = prevItems.splice(oldIndex, 1)[0];
-
-							items.splice(newIndex, 0, removed);
+							removed = prevItems[oldIndex];

 							if (evt.clone) {
-								newIndex = Sortable.utils.index(evt.clone);
-								prevItems.splice(newIndex, 0, removed);
-
 								evt.from.removeChild(evt.clone);
+								removed = angular.copy(removed);
 							}
+							else {
+								prevItems.splice(oldIndex, 1);
+							}
+
+							items.splice(newIndex, 0, removed);

-							evt.from.appendChild(evt.item); // revert element
-						} else {
+							evt.from.insertBefore(evt.item, nextSibling); // revert element
+						}
+						else {
 							items.splice(newIndex, 0, items.splice(oldIndex, 1)[0]);
 						}

@ -94,17 +99,21 @@
 						opts[name] = opts[name] || options[name];
 						return opts;
 					}, {
-						onStart: function () {
+						onStart: function (/**Event*/evt) {
+							nextSibling = evt.item.nextSibling;
 							options.onStart(source.items());
+							scope.$apply();
 						},
 						onEnd: function () {
 							options.onEnd(source.items());
+							scope.$apply();
 						},
-						onAdd: function (evt) {
+						onAdd: function (/**Event*/evt) {
 							_sync(evt);
 							options.onAdd(source.items(), removed);
+							scope.$apply();
 						},
-						onUpdate: function (evt) {
+						onUpdate: function (/**Event*/evt) {
 							_sync(evt);
 							options.onUpdate(source.items(), source.item(evt.item));
 						},
@ -119,6 +128,7 @@
 					$el.on('$destroy', function () {
 						sortable.destroy();
 						sortable = null;
+						nextSibling = null;
 					});

 					if (ngSortable && !/{|}/.test(ngSortable)) { // todo: ugly
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "sortablejs",
  "exportName": "Sortable",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "devDependencies": {
    "grunt": "*",
    "grunt-version": "*",
@ -25,9 +25,17 @@
    "drag",
    "meteor",
    "angular",
+    "ng-srotable",
    "react",
    "mixin"
  ],
  "author": "Konstantin Lebedev <ibnRubaXa@gmail.com>",
-  "license": "MIT"
+  "license": "MIT",
+  "spm": {
+    "main": "Sortable.js",
+    "ignore": [
+      "meteor",
+      "st"
+    ]
+  }
 }
--- a/st/app.css
+++ b/st/app.css
@ -220,6 +220,7 @@ img {
 	margin-right: 10px;
 	font: bold 20px Sans-Serif;
 	color: #5F9EDF;
+	display: inline-block;
 	cursor: move;
 	cursor: -webkit-grabbing;  /* overrides 'move' */
 }