rails_bootstrap_sortable 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c053a0039eb7a0e19fd7de2964fa928635a0c6
-  data.tar.gz: 2cc7d7fdda3ede56c90d9e939f9d86a60106a694
+  metadata.gz: 48f04380ee2cc19345a6e5a9227bb0503275a26a
+  data.tar.gz: f613f54e81e5fd52b0a8789d0b271087133c0faa
 SHA512:
-  metadata.gz: 84500fc60d7687a6240ec937966481f83aec09d0149484cab75a8a84d8f1b2cc055a929f5bf03f41320c2801294dd09763e220651ecf2a2d76ea3c1438ae858c
-  data.tar.gz: 2b3f1104ff420ec2d87e3cf46be2392e9c60507a277deb8380cf02cd58596a2f3ad99bc0abc0b40a0f37287ceb5e23154d9e73b0e7f3738be2616b0c6720e6b8
+  metadata.gz: 361564163a278667e2e5c21603adf9d3f817febf0085b40c9c1b2f75e102aa0592863c87bf930d74c04ed36866e2fda2754ac0b2bcbde1d84498bb52f6be51fc
+  data.tar.gz: 47f979a70da9fa386f256b5e181e9a17a204f0b6293a4d027eb0777231678c27a33b88ed12a3430bf503598174d25f9ed71022847f83852bc17875ea2112af09

data/README.md

@@ -1,5 +1,7 @@
 # rails_bootstrap_sortable
 
+[![Gem Version](https://badge.fury.io/rb/rails_bootstrap_sortable.svg)](http://badge.fury.io/rb/rails_bootstrap_sortable)
+
 This gem packages the lovely bootstrap-sortable gem from [drvic10k/bootstrap-sortable](https://github.com/drvic10k/bootstrap-sortable) into an easy to use form. rails_bootstrap_sortable adds the ability to sort bootstrap tables (or any type of table, for that matter) via Javascript by clicking on the headers of the table. The bootstrap-sortable gem is © 2014 Matúš Brliť (drvic10k), bootstrap-sortable contributors.
 
 ## Installation
@@ -7,12 +9,14 @@ This gem packages the lovely bootstrap-sortable gem from [drvic10k/bootstrap-sor
 Add these lines to your rails project's Gemfile:
 
 	gem 'momentjs-rails'
-    gem 'rails_bootstrap_sortable'
+	gem 'rails_bootstrap_sortable'
 
 Install the new gems:
 
     $ bundle install
 
+(for more info see [rails_bootstrap_sortable on rubygems.org](https://rubygems.org/gems/rails_bootstrap_sortable))
+
 Add this line to application.css.scss:
 ```
 *= require bootstrap-sortable

data/lib/rails_bootstrap_sortable/version.rb

@@ -1,3 +1,3 @@
 module RailsBootstrapSortable
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

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

@@ -4,8 +4,6 @@
 (function ($) {
 
     var $document = $(document),
-        bsSort = [],
-        lastSort,
         signClass;
 
     $.bootstrapSortable = function (applyLast, sign) {
@@ -18,13 +16,16 @@
 
         // set attributes needed for sorting
         $('table.sortable').each(function () {
-            var $this = $(this);
+            var $this = $(this),
+                context = lookupSortContext($this),
+                bsSort = context.bsSort;
             applyLast = (applyLast === true);
             $this.find('span.sign').remove();
             $this.find('thead tr').each(function (rowIndex) {
                 var columnsSkipped = 0;
                 $(this).find('th').each(function (columnIndex) {
                     var $this = $(this);
+                    $this.addClass('nosort').removeClass('up down');
                     $this.attr('data-sortcolumn', columnIndex + columnsSkipped);
                     $this.attr('data-sortkey', columnIndex + '-' + rowIndex);
                     if ($this.attr("colspan") !== undefined) {
@@ -46,7 +47,7 @@
                 var $sortTable = $this.closest('table.sortable');
                 $this.data('sortTable', $sortTable);
                 var sortKey = $this.attr('data-sortkey');
-                var thisLastSort = applyLast ? lastSort : -1;
+                var thisLastSort = applyLast ? context.lastSort : -1;
                 bsSort[sortKey] = applyLast ? bsSort[sortKey] : $this.attr('data-defaultsort');
                 if (bsSort[sortKey] !== undefined && (applyLast === (sortKey === thisLastSort))) {
                     bsSort[sortKey] = bsSort[sortKey] === 'asc' ? 'desc' : 'asc';
@@ -64,9 +65,22 @@
         $table.trigger('sorted');
     });
 
+    // Look up sorting data appropriate for the specified table (jQuery element).
+    // This allows multiple tables on one page without collisions.
+    function lookupSortContext($table) {
+        var context = $table.data("bootstrap-sortable-context");
+        if(context == null) {
+            context = { bsSort: [], lastSort: null };
+            $table.data("bootstrap-sortable-context", context);
+        }
+        return context;
+    }
+
     //Sorting mechanism separated
     function doSort($this, $table) {
-        var sortColumn = $this.attr('data-sortcolumn');
+        var sortColumn = $this.attr('data-sortcolumn'),
+            context = lookupSortContext($table),
+            bsSort = context.bsSort;
 
         var colspan = $this.attr('colspan');
         if (colspan) {
@@ -85,6 +99,10 @@
         var localSignClass = $this.attr('data-defaultsign') || signClass;
 
         // update arrow icon
+        $table.find('th').each(function() {
+            $(this).removeClass('up').removeClass('down').addClass('nosort');
+        });
+
         if ($.browser.mozilla) {
             var moz_arrow = $table.find('div.mozilla');
             if (moz_arrow !== undefined) {
@@ -103,14 +121,19 @@
         var sortKey = $this.attr('data-sortkey');
         var initialDirection = $this.attr('data-firstsort') !== 'desc' ? 'desc' : 'asc';
 
-        lastSort = sortKey;
+        context.lastSort = sortKey;
         bsSort[sortKey] = (bsSort[sortKey] || initialDirection) === 'asc' ? 'desc' : 'asc';
-        if (bsSort[sortKey] === 'desc') { $this.find('span.sign').addClass('up'); }
+        if (bsSort[sortKey] === 'desc') {
+            $this.find('span.sign').addClass('up');
+            $this.addClass('up').removeClass('down nosort');
+        } else {
+            $this.addClass('down').removeClass('up nosort');
+        }
 
         // sort rows
         var rows = $table.children('tbody').children('tr');
         rows.tsort('td:eq(' + sortColumn + ')', { order: bsSort[sortKey], attr: 'data-value' });
-        
+
         // add class to sorted column cells
         $table.find('td.sorted, th.sorted').removeClass('sorted');
         rows.find('td:eq(' + sortColumn + ')').addClass('sorted');

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

@@ -1,4 +1,4 @@
-table.sortable span.sign {
+table.sortable span.sign {
     display: block;
     position: absolute;
     top: 50%;
@@ -8,7 +8,21 @@ table.sortable span.sign {
     color: #bfbfc1;
 }
 
-table.sortable span.arrow, span.reversed {
+table.sortable th:after {
+    display: block;
+    position: absolute;
+    top: 50%;
+    right: 5px;
+    font-size: 12px;
+    margin-top: -10px;
+    color: #bfbfc1;
+}
+
+table.sortable th.arrow:after {
+    content: '';
+}
+
+table.sortable span.arrow, span.reversed, th.arrow.down:after, th.reversedarrow.down:after, th.arrow.up:after, th.reversedarrow.up:after {
     border-style: solid;
     border-width: 5px;
     font-size: 0;
@@ -19,52 +33,54 @@ table.sortable span.arrow, span.reversed {
     margin-top: -2px;
 }
 
-    table.sortable span.arrow.up {
+    table.sortable span.arrow.up, th.arrow.up:after {
         border-color: transparent transparent #ccc transparent;
         margin-top: -7px;
     }
 
-table.sortable span.reversed {
+table.sortable span.reversed, th.reversedarrow.down:after {
     border-color: transparent transparent #ccc transparent;
     margin-top: -7px;
 }
 
-    table.sortable span.reversed.up {
+    table.sortable span.reversed.up, th.reversedarrow.up:after {
         border-color: #ccc transparent transparent transparent;
         margin-top: -2px;
     }
 
-
-
-table.sortable span.az:before {
+table.sortable span.az:before, th.az.down:after {
     content: "a .. z";
 }
 
-table.sortable span.az.up:before {
+table.sortable span.az.up:before, th.az.up:after {
     content: "z .. a";
 }
 
-table.sortable span.AZ:before {
+table.sortable th.az.nosort:after, th.AZ.nosort:after, th._19.nosort:after, th.month.nosort:after {
+    content: "..";
+}
+
+table.sortable span.AZ:before, th.AZ.down:after {
     content: "A .. Z";
 }
 
-table.sortable span.AZ.up:before {
+table.sortable span.AZ.up:before, th.AZ.up:after {
     content: "Z .. A";
 }
 
-table.sortable span._19:before {
+table.sortable span._19:before, th._19.down:after {
     content: "1 .. 9";
 }
 
-table.sortable span._19.up:before {
+table.sortable span._19.up:before, th._19.up:after {
     content: "9 .. 1";
 }
 
-table.sortable span.month:before {
+table.sortable span.month:before, th.month.down:after {
     content: "jan .. dec";
 }
 
-table.sortable span.month.up:before {
+table.sortable span.month.up:before, th.month.up:after {
     content: "dec .. jan";
 }
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_sortable
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - SamKelly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: momentjs-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.3
 description: ''
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -79,12 +79,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []