From 5325c8a84224f231578f092ca56382480652cc91 Mon Sep 17 00:00:00 2001
From: Markus Ast <m@rkusa.st>
Date: Tue, 27 Jan 2015 16:41:11 +0100
Subject: [PATCH 1/3] fix index calculation to skip templates

---
 Sortable.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Sortable.js b/Sortable.js
index 60cd0bd..153cf1b 100644
--- 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;
 	}

From f500b679f22b5aadf794a522751d5bb13ba881a0 Mon Sep 17 00:00:00 2001
From: RubaXa <ibnRubaXa@gmail.com>
Date: Tue, 27 Jan 2015 23:47:16 +0300
Subject: [PATCH 2/3] #238: * disabled

---
 Sortable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sortable.js b/Sortable.js
index 60cd0bd..6395215 100644
--- a/Sortable.js
+++ b/Sortable.js
@@ -469,7 +469,7 @@
 				!options.dragoverBubble && evt.stopPropagation();
 			}
 
-			if (!_silent && activeGroup &&
+			if (!_silent && activeGroup && !options.disabled &&
 				(isOwner
 					? canSort || (revert = !rootEl.contains(dragEl))
 					: activeGroup.pull && groupPut && (

From 705b3ed1aef454a897c433468e046d1ddd9f0cfb Mon Sep 17 00:00:00 2001
From: RubaXa <ibnRubaXa@gmail.com>
Date: Tue, 27 Jan 2015 23:47:48 +0300
Subject: [PATCH 3/3] #238: * scope after event

---
 ng-sortable.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ng-sortable.js b/ng-sortable.js
index 8d310c4..ecbf23b 100644
--- a/ng-sortable.js
+++ b/ng-sortable.js
@@ -15,7 +15,7 @@
 	'use strict';
 
 	angular.module('ng-sortable', [])
-		.constant('$version', '0.3.4')
+		.constant('$version', '0.3.5')
 		.directive('ngSortable', ['$parse', function ($parse) {
 			var removed,
 				nextSibling;
@@ -101,13 +101,16 @@
 						onStart: function (/**Event*/evt) {
 							nextSibling = evt.item.nextSibling;
 							options.onStart(source.items());
+							scope.$apply();
 						},
 						onEnd: function () {
 							options.onEnd(source.items());
+							scope.$apply();
 						},
 						onAdd: function (/**Event*/evt) {
 							_sync(evt);
 							options.onAdd(source.items(), removed);
+							scope.$apply();
 						},
 						onUpdate: function (/**Event*/evt) {
 							_sync(evt);