Deffer sortable init to as late as possible, fix removing items

OpenBuildings · Jul 31, 2013 · 009b776 · 009b776
1 parent 512b18a
commit 009b776
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 61 deletions.
diff --git a/views/tart/layout/template.php b/views/tart/layout/template.php
@@ -31,7 +31,7 @@
 			</div>
 		</div>
 
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+		<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
 		<script src="/jam-tart/js/plugins.min.js"></script>
 		<script src="/jam-tart/js/bootstrap.min.js"></script>
 		<script src="/jam-tart/js/bootstrap-extensions.min.js"></script>

diff --git a/web/css/general.css b/web/css/general.css
@@ -168,7 +168,7 @@ textarea.hide {
 table .ui-sortable-helper{
   opacity: 0.5;
 }
-.ui-sortable .thumbnail {
+.ui-sortable-helper {
   -webkit-transition: none !important;
   -moz-transition: none !important;
   -o-transition: none !important;

diff --git a/web/js/bootstrap-extensions.js b/web/js/bootstrap-extensions.js
@@ -385,36 +385,39 @@
  /* sortable DATA-API
 	* ============ */
 
-	$(function () {
-		$(document).on('mouseover.sortable.data-api', '[data-provide="sortable"]', function (e) {
-			var $this = $(this);
-			if ($this.data('sortable')) return;
-			e.preventDefault();
-			$this.sortable({
-				handle: $this.data('handle'),
-				items: $this.data('items'),
-				placeholder: $this.data('placeholder'),
-				tolerance: $this.data('tolerance'),
-				stop: function(event, ui) {
-					if ($(this).data('sortUrl')) {
-						// determine whether we move the element up or down
-						$.ajax([
-							$(this).data('sortUrl'), 
-							'&from=',
-							getElementSortableId(ui.item, $(this).data('handle')),
-							'&to=',
-							getElementSortableId(ui.item.next(), $(this).data('handle'))
-						].join(''));
+$(function () {
+
+		document.addEventListener('mousedown', function(event) {
+			if ($(event.target).closest('[data-provide="sortable"]').length) {
+				var $this = $(event.target).closest('[data-provide="sortable"]');
+				if ($this.data('sortable')) return;
+
+				$this.sortable({
+					handle: $this.data('handle'),
+					items: $this.data('items'),
+					placeholder: $this.data('placeholder'),
+					tolerance: $this.data('tolerance'),
+					stop: function(event, ui) {
+						if ($(this).data('sortUrl')) {
+							// determine whether we move the element up or down
+							$.ajax([
+								$(this).data('sortUrl'), 
+								'&from=',
+								getElementSortableId(ui.item, $(this).data('handle')),
+								'&to=',
+								getElementSortableId(ui.item.next(), $(this).data('handle'))
+							].join(''));
+						}
+						else
+						{
+							$(this).children().each(function(i){
+								$(this).find('[data-sortable="position"]').val(i);
+							});
+						}
 					}
-					else
-					{
-						$(this).children().each(function(i){
-							$(this).find('[data-sortable="position"]').val(i);
-						});
-					}
-				}
-			});
-		});
+				});
+			}
+		}, true);
 	});
 
 }(window.jQuery);!function ($) {

diff --git a/web/js/bootstrap-extensions.min.js b/web/js/bootstrap-extensions.min.js
diff --git a/web/js/bootstrap-extensions/bootstrap-jquery-ui-sortable.js b/web/js/bootstrap-extensions/bootstrap-jquery-ui-sortable.js
@@ -9,36 +9,39 @@
  /* sortable DATA-API
 	* ============ */
 
-	$(function () {
-		$(document).on('mouseover.sortable.data-api', '[data-provide="sortable"]', function (e) {
-			var $this = $(this);
-			if ($this.data('sortable')) return;
-			e.preventDefault();
-			$this.sortable({
-				handle: $this.data('handle'),
-				items: $this.data('items'),
-				placeholder: $this.data('placeholder'),
-				tolerance: $this.data('tolerance'),
-				stop: function(event, ui) {
-					if ($(this).data('sortUrl')) {
-						// determine whether we move the element up or down
-						$.ajax([
-							$(this).data('sortUrl'), 
-							'&from=',
-							getElementSortableId(ui.item, $(this).data('handle')),
-							'&to=',
-							getElementSortableId(ui.item.next(), $(this).data('handle'))
-						].join(''));
-					}
-					else
-					{
-						$(this).children().each(function(i){
-							$(this).find('[data-sortable="position"]').val(i);
-						});
+$(function () {
+
+		document.addEventListener('mousedown', function(event) {
+			if ($(event.target).closest('[data-provide="sortable"]').length) {
+				var $this = $(event.target).closest('[data-provide="sortable"]');
+				if ($this.data('sortable')) return;
+
+				$this.sortable({
+					handle: $this.data('handle'),
+					items: $this.data('items'),
+					placeholder: $this.data('placeholder'),
+					tolerance: $this.data('tolerance'),
+					stop: function(event, ui) {
+						if ($(this).data('sortUrl')) {
+							// determine whether we move the element up or down
+							$.ajax([
+								$(this).data('sortUrl'), 
+								'&from=',
+								getElementSortableId(ui.item, $(this).data('handle')),
+								'&to=',
+								getElementSortableId(ui.item.next(), $(this).data('handle'))
+							].join(''));
+						}
+						else
+						{
+							$(this).children().each(function(i){
+								$(this).find('[data-sortable="position"]').val(i);
+							});
+						}
 					}
-				}
-			});
-		});
+				});
+			}
+		}, true);
 	});
 
 }(window.jQuery);