multi-select-rails 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a3426dc95dcf805c6e8b453049706166b311f69
-  data.tar.gz: 1bcac4123f932f41df2b92b9bd6060650fcb0c90
+  metadata.gz: df5e07089789a8b2bc30bf9c79e848b8173aeea0
+  data.tar.gz: 1ab86991f4a1c054acc277566c598617d879f138
 SHA512:
-  metadata.gz: 406c20f4550b34e2aca2af53646d142b9afb33adf3d4163d4c7cf1ecdb2adfdaee966a22d3ca490b8b7b5117a1958a3b878ebf32ea38117228ede7f08311dec1
-  data.tar.gz: 014c71c24913c9b313c2b0736846016eb400cc3e034fcf64e1f481ddaffdd98b1fd5520a29282f959acfa9f9bffe24f897edd51722e1e86970a2aad0de86be4b
+  metadata.gz: f00d65b5570c01e27f25f0525e909413c150fa636ddc1261507b2730554192a8006b1e3284e6ba1941b944f42cf14972ca844d52290fd5ebe5dc4d4a8466a990
+  data.tar.gz: 57e493df1d277c6607390e230ef891291caf7d18ea2b352b21699e0a2e55e7c41232b6d9c64ee6d681ee3de85e9ec2bfff066c47489fd53d56f000ee46e85144

data/README.md

@@ -29,7 +29,7 @@ Add to your `app/assets/stylesheets/application.css`
 ## Updating the gem
 There are two rake tasks designed to ease the maintenance of this gem.
 
-The `update` task pulls the latest X-editable code from github and places images, stylesheets and javascripts in the correct gem paths. It also changes background-image properties in the stylesheet to asset pipeline equivalents.
+The `update` task pulls the latest multi-select code from github and places images, stylesheets and javascripts in the correct gem paths. It also changes background-image properties in the stylesheet to asset pipeline equivalents.
 
 	rake update
 	

data/app/assets/javascripts/multi-select.js

@@ -149,18 +149,18 @@
           $selectionOptgroup.append($(optgroupTpl));
           if (that.options.selectableOptgroup){
             $selectableOptgroup.find('.ms-optgroup-label').on('click', function(){
-              var values = $optgroup.children(':not(:selected)').map(function(){ return $(this).val() }).get();
+              var values = $optgroup.children(':not(:selected, :disabled)').map(function(){ return $(this).val() }).get();
               that.select(values);
             });
             $selectionOptgroup.find('.ms-optgroup-label').on('click', function(){
-              var values = $optgroup.children(':selected').map(function(){ return $(this).val() }).get();
+              var values = $optgroup.children(':selected:not(:disabled)').map(function(){ return $(this).val() }).get();
               that.deselect(values);
             });
           }
           that.$selectableUl.append($selectableOptgroup);
           that.$selectionUl.append($selectionOptgroup);
         }
-        index = index == undefined ? $selectableOptgroup.children().length : index + 1;
+        index = index == undefined ? $selectableOptgroup.find('ul').children().length : index + 1;
         selectableLi.insertAt(index, $selectableOptgroup.children());
         selectedLi.insertAt(index, $selectionOptgroup.children());
       } else {
@@ -244,10 +244,6 @@
           containerHeight = $list.height(),
           containerSelector = '#'+this.$container.prop('id');
 
-      // Deactive mouseenter event when move is active
-      // It fixes a bug when mouse is over the list
-      $elems.off('mouseenter');
-
       $elems.removeClass('ms-hover');
       if (direction === 1){ // DOWN
 
@@ -298,21 +294,22 @@
     },
 
     'selectHighlighted' : function($list){
-        var $elems = $list.find(this.elemsSelector),
-            $highlightedElem = $elems.filter('.ms-hover').first();
+      var $elems = $list.find(this.elemsSelector),
+          $highlightedElem = $elems.filter('.ms-hover').first();
 
-        if ($highlightedElem.length > 0){
-          if ($list.parent().hasClass('ms-selectable')){
-            this.select($highlightedElem.data('ms-value'));
-          } else {
-            this.deselect($highlightedElem.data('ms-value'));
-          }
-          $elems.removeClass('ms-hover');
+      if ($highlightedElem.length > 0){
+        if ($list.parent().hasClass('ms-selectable')){
+          this.select($highlightedElem.data('ms-value'));
+        } else {
+          this.deselect($highlightedElem.data('ms-value'));
         }
+        $elems.removeClass('ms-hover');
+      }
     },
 
     'switchList' : function($list){
       $list.blur();
+      this.$container.find(this.elemsSelector).removeClass('ms-hover');
       if ($list.parent().hasClass('ms-selectable')){
         this.$selectionUl.focus();
       } else {
@@ -322,16 +319,10 @@
 
     'activeMouse' : function($list){
       var that = this;
-      var lastMovedDom = false;
-      $list.on('mousemove', function(){
-        if (lastMovedDom === this) return;
-				lastMovedDom = this;
-				var elems = $list.find(that.elemsSelector);
-
-        elems.on('mouseenter', function(){
-          elems.removeClass('ms-hover');
-          $(this).addClass('ms-hover');
-        });
+
+      $('body').on('mouseenter', that.elemsSelector, function(){
+        $(this).parents('.ms-container').find(that.elemsSelector).removeClass('ms-hover');
+        $(this).addClass('ms-hover');
       });
     },
 
@@ -364,8 +355,11 @@
       if (selectables.length > 0){
         selectables.addClass('ms-selected').hide();
         selections.addClass('ms-selected').show();
+
         options.prop('selected', true);
 
+        that.$container.find(that.elemsSelector).removeClass('ms-hover');
+
         var selectableOptgroups = that.$selectableUl.children('.ms-optgroup-container');
         if (selectableOptgroups.length > 0){
           selectableOptgroups.each(function(){
@@ -383,8 +377,8 @@
             }
           });
         } else {
-          if (that.options.keepOrder){
-            var selectionLiLast = that.$selectionUl.find('.ms-selected'); 
+          if (that.options.keepOrder && method !== 'init'){
+            var selectionLiLast = that.$selectionUl.find('.ms-selected');
             if((selectionLiLast.length > 1) && (selectionLiLast.last().get(0) != selections.get(0))) {
               selections.insertAfter(selectionLiLast.last());
             }
@@ -414,6 +408,8 @@
         selections.removeClass('ms-selected').hide();
         options.prop('selected', false);
 
+        that.$container.find(that.elemsSelector).removeClass('ms-hover');
+
         var selectableOptgroups = that.$selectableUl.children('.ms-optgroup-container');
         if (selectableOptgroups.length > 0){
           selectableOptgroups.each(function(){
@@ -474,12 +470,12 @@
     },
 
     sanitize: function(value){
-      var hash = 0, i, char;
+      var hash = 0, i, character;
       if (value.length == 0) return hash;
       var ls = 0;
       for (i = 0, ls = value.length; i < ls; i++) {
-        char  = value.charCodeAt(i);
-        hash  = ((hash<<5)-hash)+char;
+        character  = value.charCodeAt(i);
+        hash  = ((hash<<5)-hash)+character;
         hash |= 0; // Convert to 32bit integer
       }
       return hash;

data/lib/multi-select-rails/version.rb

@@ -1,5 +1,5 @@
 module MultiSelectRails
   module Rails
-    VERSION = "0.9.11"
+    VERSION = "0.9.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi-select-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Per Andersson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties