fixed - mainsort larger than colspan

fixed a possible issue, if the mainsort would be set outside of the colspan in this case, the last cell will be used
drvic10k · Feb 7, 2015 · d9529bb · d9529bb
1 parent e2b257a
commit d9529bb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Scripts/bootstrap-sortable.js b/Scripts/bootstrap-sortable.js
@@ -123,7 +123,7 @@
 
         var colspan = $this.attr('colspan');
         if (colspan) {
-            var mainSort = parseFloat($this.data('mainsort')) || 0;
+            var mainSort = Math.min(colspan - 1, parseFloat($this.data('mainsort')) || 0);
             var rowIndex = parseFloat($this.data('sortkey').split('-').pop());
 
             // If there is one more row in header, delve deeper