Merge branch 'master' of github.com:RubaXa/Sortable

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 {
@@ -430,7 +430,7 @@ Link to the active instance.
 
 
 ## MIT LICENSE
-Copyright 2013-2014 Lebedev Konstantin <[email protected]>
+Copyright 2013-2015 Lebedev Konstantin <[email protected]>
 http://rubaxa.github.io/Sortable/
 
 Permission is hereby granted, free of charge, to any person obtaining

Sortable.js

@@ -809,7 +809,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)
 					)
 				) {
@@ -937,7 +937,7 @@
 	 */
 	function _index(/**HTMLElement*/el) {
 		var index = 0;
-		while (el && (el = el.previousElementSibling) && (el.nodeName !== 'TEMPLATE')) {
+		while (el && (el = el.previousElementSibling) && (el.nodeName.toUpperCase() !== 'TEMPLATE')) {
 			index++;
 		}
 		return index;

meteor/package.js

@@ -16,7 +16,7 @@ Package.describe({
 Package.onUse(function (api) {
 	api.versionsFrom(['[email protected]', '[email protected]']);
 	api.use('templating', 'client');
-	api.use('dburles:[email protected].5');  // to watch collections getting created
+	api.use('dburles:[email protected].6');  // to watch collections getting created
 	api.export('Sortable');
 	api.addFiles([
 		'Sortable.js',

ng-sortable.js

@@ -3,7 +3,7 @@
  * @licence MIT
  */
 angular.module('ng-sortable', [])
-	.constant('$version', '0.3.2')
+	.constant('$version', '0.3.3')
 	.directive('ngSortable', ['$parse', function ($parse) {
 		'use strict';
 
@@ -17,7 +17,9 @@ angular.module('ng-sortable', [])
 						(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]);

package.json

@@ -25,5 +25,12 @@
     "drag"
   ],
   "author": "Konstantin Lebedev <[email protected]>",
-  "license": "MIT"
+  "license": "MIT",
+  "spm": {
+    "main": "Sortable.js",
+    "ignore": [
+      "meteor",
+      "st"
+    ]
+  }
 }