rails_bootstrap_sortable 1.11.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efac0d3b6bad0b1dff278613be5a8aab39c66607
-  data.tar.gz: 27edb2e5dc1157c6cba2055d52438c0cb72c6efd
+  metadata.gz: 637e10266713b22faa3fa473f7a7bc74441655ac
+  data.tar.gz: d763848bc8d27f58c20b4263a64134b22c7afbd3
 SHA512:
-  metadata.gz: 27342cf52a2334d61955cfb09e0c4b644bdb29213f43e05e9324f6825a367d5df8bf9c59fa1fc4929c9bd88642f772fe57c02ca8d698efca58c407cd5799a2cc
-  data.tar.gz: 3b784a1efb9c42d8e7654104e1db5743af6873d617646b563aa4b480d200ba2ac81050b50f50e29456d59658be05752f06a7d652cd6b8c1d34cd770f9da26f04
+  metadata.gz: 75f6e7c3ff9ac11aa53db78217605264909db683af956353e0582b57321d62a952d18e2cb9a2bde610a0be84e912f26cec8b47c639c824a85deb56d3f8b54785
+  data.tar.gz: 1da48ab2ca83197057bbb395b824661a20a78a48c1a1e88825a00a84f1babf3ab7bdfa128caf6f6399ba82de0e060bbabcd78432d32aa0fd53f591f4caabc957

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_sortable (1.11.2)
+    rails_bootstrap_sortable (2.0.0)
       momentjs-rails (~> 2, >= 2.8.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activesupport (4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -29,32 +29,32 @@ GEM
     builder (3.2.2)
     erubis (2.7.0)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.2)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mini_portile (0.6.2)
-    minitest (5.6.1)
-    momentjs-rails (2.10.2)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    momentjs-rails (2.11.0)
       railties (>= 3.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.1)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (11.1.2)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
@@ -67,3 +67,6 @@ DEPENDENCIES
   bundler (~> 1.6)
   rails_bootstrap_sortable!
   rake
+
+BUNDLED WITH
+   1.11.2

data/lib/rails_bootstrap_sortable/version.rb

@@ -1,3 +1,3 @@
 module RailsBootstrapSortable
-  VERSION = "1.11.2"
+  VERSION = "2.0.0"
 end

data/vendor/assets/javascripts/bootstrap-sortable.js

@@ -1,3 +1,13 @@
+/**
+ * adding sorting ability to HTML tables with Bootstrap styling
+ * @summary HTML tables sorting ability
+ * @version 2.0.0
+ * @requires tinysort, moment.js, jQuery
+ * @license MIT
+ * @author Matus Brlit (drvic10k)
+ * @copyright Matus Brlit (drvic10k), bootstrap-sortable contributors
+ */
+
 /**
  * TinySort is a small script that sorts HTML elements. It sorts by text- or attribute value, or by that of one of it's children.
  * @summary A nodeElement sorting script.
@@ -13,25 +23,42 @@
 
     var $document = $(document),
         signClass,
-        sortEngine;
+        sortEngine,
+        emptyEnd;
 
-    $.bootstrapSortable = function (applyLast, sign, customSort) {
+    $.bootstrapSortable = function (options) {
+        if (options == undefined) {
+            initialize({});
+        }
+        else if (options.constructor === Boolean) {
+            initialize({ applyLast: options });
+        }
+        else if (options.sortingHeader !== undefined) {
+            sortByColumn(options.sortingHeader);
+        }
+        else {
+            initialize(options);
+        }
+    };
 
+    function initialize(options) {
         // Check if moment.js is available
         var momentJsAvailable = (typeof moment !== 'undefined');
 
         // Set class based on sign parameter
-        signClass = !sign ? "arrow" : sign;
+        signClass = !options.sign ? "arrow" : options.sign;
 
         // Set sorting algorithm
-        if (customSort == 'default')
-            customSort = defaultSortEngine;
-        sortEngine = customSort || sortEngine || defaultSortEngine;
+        if (options.customSort == 'default')
+            options.customSort = defaultSortEngine;
+        sortEngine = options.customSort || sortEngine || defaultSortEngine;
+
+        emptyEnd = options.emptyEnd;
 
         // Set attributes needed for sorting
         $('table.sortable').each(function () {
             var $this = $(this);
-            applyLast = (applyLast === true);
+            var applyLast = (options.applyLast === true);
             $this.find('span.sign').remove();
 
             // Add placeholder cells for colspans
@@ -57,24 +84,46 @@
             // Set indexes to header cells
             $this.find('thead tr').each(function (rowIndex) {
                 $(this).find('th').each(function (columnIndex) {
-                    var $this = $(this);
-                    $this.addClass('nosort').removeClass('up down');
-                    $this.attr('data-sortcolumn', columnIndex);
-                    $this.attr('data-sortkey', columnIndex + '-' + rowIndex);
+                    var $header = $(this);
+                    $header.addClass('nosort').removeClass('up down');
+                    $header.attr('data-sortcolumn', columnIndex);
+                    $header.attr('data-sortkey', columnIndex + '-' + rowIndex);
                 });
             });
 
             // Cleanup placeholder cells
             $this.find('thead .rowspan-compensate, .colspan-compensate').remove();
 
+            // Initialize sorting values specified in header
+            $this.find('th').each(function () {
+                var $header = $(this);
+                if ($header.attr('data-dateformat') !== undefined && momentJsAvailable) {
+                    var colNumber = parseFloat($header.attr('data-sortcolumn'));
+                    $this.find('td:nth-child(' + (colNumber + 1) + ')').each(function () {
+                        var $cell = $(this);
+                        $cell.attr('data-value', moment($cell.text(), $header.attr('data-dateformat')).format('YYYY/MM/DD/HH/mm/ss'));
+                    });
+                }
+                else if ($header.attr('data-valueprovider') !== undefined) {
+                    var colNumber = parseFloat($header.attr('data-sortcolumn'));
+                    $this.find('td:nth-child(' + (colNumber + 1) + ')').each(function () {
+                        var $cell = $(this);
+                        $cell.attr('data-value', new RegExp($header.attr('data-valueprovider')).exec($cell.text())[0]);
+                    });
+                }
+            });
+
             // Initialize sorting values
             $this.find('td').each(function () {
-                var $this = $(this);
-                if ($this.attr('data-dateformat') !== undefined && momentJsAvailable) {
-                    $this.attr('data-value', moment($this.text(), $this.attr('data-dateformat')).format('YYYY/MM/DD/HH/mm/ss'));
+                var $cell = $(this);
+                if ($cell.attr('data-dateformat') !== undefined && momentJsAvailable) {
+                    $cell.attr('data-value', moment($cell.text(), $cell.attr('data-dateformat')).format('YYYY/MM/DD/HH/mm/ss'));
+                }
+                else if ($cell.attr('data-valueprovider') !== undefined) {
+                    $cell.attr('data-value', new RegExp($cell.attr('data-valueprovider')).exec($cell.text())[0]);
                 }
                 else {
-                    $this.attr('data-value') === undefined && $this.attr('data-value', $this.text());
+                    $cell.attr('data-value') === undefined && $cell.attr('data-value', $cell.text());
                 }
             });
 
@@ -82,28 +131,33 @@
                 bsSort = context.bsSort;
 
             $this.find('thead th[data-defaultsort!="disabled"]').each(function (index) {
-                var $this = $(this);
-                var $sortTable = $this.closest('table.sortable');
-                $this.data('sortTable', $sortTable);
-                var sortKey = $this.attr('data-sortkey');
+                var $header = $(this);
+                var $sortTable = $header.closest('table.sortable');
+                $header.data('sortTable', $sortTable);
+                var sortKey = $header.attr('data-sortkey');
                 var thisLastSort = applyLast ? context.lastSort : -1;
-                bsSort[sortKey] = applyLast ? bsSort[sortKey] : $this.attr('data-defaultsort');
+                bsSort[sortKey] = applyLast ? bsSort[sortKey] : $header.attr('data-defaultsort');
                 if (bsSort[sortKey] !== undefined && (applyLast === (sortKey === thisLastSort))) {
                     bsSort[sortKey] = bsSort[sortKey] === 'asc' ? 'desc' : 'asc';
-                    doSort($this, $sortTable);
+                    doSort($header, $sortTable);
                 }
             });
             $this.trigger('sorted');
         });
-    };
+    }
 
     // Add click event to table header
-    $document.on('click', 'table.sortable thead th[data-defaultsort!="disabled"]', function (e) {
-        var $this = $(this), $table = $this.data('sortTable') || $this.closest('table.sortable');
+    $document.on('click', 'table.sortable>thead th[data-defaultsort!="disabled"]', function (e) {
+        sortByColumn(this);
+    });
+
+    // element is the header of the column to sort (the clicked header)
+    function sortByColumn(element) {
+        var $this = $(element), $table = $this.data('sortTable') || $this.closest('table.sortable');
         $table.trigger('before-sort');
         doSort($this, $table);
         $table.trigger('sorted');
-    });
+    }
 
     // Look up sorting data appropriate for the specified table (jQuery element).
     // This allows multiple tables on one page without collisions.
@@ -173,8 +227,13 @@
         var sortKey = $this.attr('data-sortkey');
         var initialDirection = $this.attr('data-firstsort') !== 'desc' ? 'desc' : 'asc';
 
+        var newDirection = (bsSort[sortKey] || initialDirection);
+        if (context.lastSort === sortKey || bsSort[sortKey] === undefined) {
+            newDirection = newDirection === 'asc' ? 'desc' : 'asc';
+        }
+        bsSort[sortKey] = newDirection;
         context.lastSort = sortKey;
-        bsSort[sortKey] = (bsSort[sortKey] || initialDirection) === 'asc' ? 'desc' : 'asc';
+
         if (bsSort[sortKey] === 'desc') {
             $this.find('span.sign').addClass('up');
             $this.addClass('up').removeClass('down nosort');
@@ -182,13 +241,34 @@
             $this.addClass('down').removeClass('up nosort');
         }
 
-        // sort rows
+        // remove rows that should not be sorted
         var rows = $table.children('tbody').children('tr');
-        sortEngine(rows, { selector: 'td:nth-child(' + (sortColumn + 1) + ')', order: bsSort[sortKey], data: 'value' });
+        var fixedRows = [];
+        $(rows.filter('[data-disablesort="true"]').get().reverse()).each(function (index, fixedRow) {
+            var $fixedRow = $(fixedRow);
+            fixedRows.push({ index: rows.index($fixedRow), row: $fixedRow });
+            $fixedRow.remove();
+        });
+
+        // sort rows
+        var rowsToSort = rows.not('[data-disablesort="true"]');
+        if (rowsToSort.length != 0) {
+            var emptySorting = bsSort[sortKey] === 'asc' ? emptyEnd : false;
+            sortEngine(rowsToSort, { emptyEnd: emptySorting, selector: 'td:nth-child(' + (sortColumn + 1) + ')', order: bsSort[sortKey], data: 'value' });
+        }
+
+        // add back the fixed rows
+        $(fixedRows.reverse()).each(function (index, row) {
+            if (row.index === 0) {
+                $table.children('tbody').prepend(row.row);
+            } else {
+                $table.children('tbody').children('tr').eq(row.index - 1).after(row.row);
+            }
+        });
 
         // add class to sorted column cells
         $table.find('td.sorted, th.sorted').removeClass('sorted');
-        rows.find('td:eq(' + sortColumn + ')').addClass('sorted');
+        rowsToSort.find('td:eq(' + sortColumn + ')').addClass('sorted');
         $this.addClass('sorted');
     }
 
@@ -206,4 +286,4 @@
     // Initialise on DOM ready
     $($.bootstrapSortable);
 
-}(jQuery));
+}(jQuery));

data/vendor/assets/stylesheets/bootstrap-sortable.css

@@ -1,4 +1,14 @@
-table.sortable span.sign {
+/**
+ * adding sorting ability to HTML tables with Bootstrap styling
+ * @summary HTML tables sorting ability
+ * @version 2.0.0
+ * @requires tinysort, moment.js, jQuery
+ * @license MIT
+ * @author Matus Brlit (drvic10k)
+ * @copyright Matus Brlit (drvic10k), bootstrap-sortable contributors
+ */
+
+table.sortable span.sign {
     display: block;
     position: absolute;
     top: 50%;
@@ -84,17 +94,17 @@ table.sortable span.month.up:before, th.month.up:after {
     content: "dec .. jan";
 }
 
-table.sortable thead th:not([data-defaultsort=disabled]) {
+table.sortable>thead th:not([data-defaultsort=disabled]) {
     cursor: pointer;
     position: relative;
     top: 0;
     left: 0;
 }
 
-table.sortable thead th:hover:not([data-defaultsort=disabled]) {
+table.sortable>thead th:hover:not([data-defaultsort=disabled]) {
     background: #efefef;
 }
 
-table.sortable thead th div.mozilla {
+table.sortable>thead th div.mozilla {
     position: relative;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_sortable
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 2.0.0
 platform: ruby
 authors:
 - SamKelly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem that packages the bootstrap-sortable js library from https://github.com/drvic10k/bootstrap-sortable