Merge branch 'dev' of github.com:RubaXa/Sortable into dev

RubaXa · RubaXa · commit fb3abe8224d4 · 2015-01-27T23:47:58.000+03:00
diff --git a/Sortable.js b/Sortable.js
@@ -949,8 +949,10 @@
 	 */
 	function _index(/**HTMLElement*/el) {
 		var index = 0;
-		while (el && (el = el.previousElementSibling) && (el.nodeName.toUpperCase() !== 'TEMPLATE')) {
-			index++;
+		while (el && (el = el.previousElementSibling)) {
+			if (el.nodeName.toUpperCase() !== 'TEMPLATE') {
+				index++;
+			}
 		}
 		return index;
 	}

Original file line number	Diff line number	Diff line change
`@@ -949,8 +949,10 @@`
`949`	`949`	`*/`
`950`	`950`	`function _index(/*HTMLElement/el) {`
`951`	`951`	`var index = 0;`
`952`		`- while (el && (el = el.previousElementSibling) && (el.nodeName.toUpperCase() !== 'TEMPLATE')) {`
`953`		`- index++;`
	`952`	`+ while (el && (el = el.previousElementSibling)) {`
	`953`	`+ if (el.nodeName.toUpperCase() !== 'TEMPLATE') {`
	`954`	`+ index++;`
	`955`	`+ }`
`954`	`956`	`}`
`955`	`957`	`return index;`
`956`	`958`	`}`