multi-select-rails 0.9.8.1 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd6a695b1c387f2fc70d3ba787aeb6303338e5b1
-  data.tar.gz: 30652e630b096b3122242912462a7404f6eb5602
+  metadata.gz: 6a70e40728dbb139bdada2b45f84de2cedcd05e2
+  data.tar.gz: 8737300ca714c1ab8a68f1969723fb543e80fe9d
 SHA512:
-  metadata.gz: 7e80700ec17c6b7fec9a0eabcbe83975f3c69838d3ac748d2680db942cabe37b0f3216e8c09f958489af3786646af34c0289c1e2e753c5738ca27160de64e341
-  data.tar.gz: e77cedbce96dfd161864fb48d69f77a0c3b3343dca34a7594dfaf39dfb4b7590a60f6b9b6417f6b45665e6da41f4d0f2ae00db2a43c43d713a1045d1d686c7ce
+  metadata.gz: f33126f4ac398c7d2e74e2bc406d4d0660c7b4919924ca514f70ce8bb048457e2ce9d35cf85c682e1001df609a97010bd747d60ac9058594c119c7a7f35a5f94
+  data.tar.gz: 27d1f645f90ac3173c3426c2f10f4fc49994e1cde25a941be0349d33962e54aaa7e7b14d6c0de2f2b984a3dc9554de5e948b3d995f0ee256bfb421201a388f5d

data/LICENSE.txt

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -1,5 +1,5 @@
 /*
-* MultiSelect v0.9.8
+* MultiSelect v0.9.10
 * Copyright (c) 2012 Louis Cuny
 *
 * This program is free software. It comes without any warranty, to
@@ -20,15 +20,13 @@
   var MultiSelect = function (element, options) {
     this.options = options;
     this.$element = $(element);
-
     this.$container = $('<div/>', { 'class': "ms-container" });
     this.$selectableContainer = $('<div/>', { 'class': 'ms-selectable' });
     this.$selectionContainer = $('<div/>', { 'class': 'ms-selection' });
     this.$selectableUl = $('<ul/>', { 'class': "ms-list", 'tabindex' : '-1' });
     this.$selectionUl = $('<ul/>', { 'class': "ms-list", 'tabindex' : '-1' });
     this.scrollTo = 0;
-    this.sanitizeRegexp = new RegExp("\\W+", 'gi');
-    this.elemsSelector = 'li:visible:not(.ms-optgroup-label,.ms-optgroup-container)';
+    this.elemsSelector = 'li:visible:not(.ms-optgroup-label,.ms-optgroup-container,.'+options.disabledClass+')';
   };
 
   MultiSelect.prototype = {
@@ -42,7 +40,7 @@
         ms.css({ position: 'absolute', left: '-9999px' });
         ms.attr('id', ms.attr('id') ? ms.attr('id') : Math.ceil(Math.random()*1000)+'multiselect');
         this.$container.attr('id', 'ms-'+ms.attr('id'));
-
+        this.$container.addClass(that.options.cssClass);
         ms.find('option').each(function(){
           that.generateLisFromOption(this);
         });
@@ -97,7 +95,7 @@
       }
     },
 
-    'generateLisFromOption' : function(option){
+    'generateLisFromOption' : function(option, index, $container){
       var that = this,
           ms = that.$element,
           attributes = "",
@@ -106,14 +104,14 @@
       for (var cpt = 0; cpt < option.attributes.length; cpt++){
         var attr = option.attributes[cpt];
 
-        if(attr.name !== 'value'){
+        if(attr.name !== 'value' && attr.name !== 'disabled'){
           attributes += attr.name+'="'+attr.value+'" ';
         }
       }
-      var selectableLi = $('<li '+attributes+'><span>'+$option.text()+'</span></li>'),
+      var selectableLi = $('<li '+attributes+'><span>'+that.escapeHTML($option.text())+'</span></li>'),
           selectedLi = selectableLi.clone(),
           value = $option.val(),
-          elementId = that.sanitize(value, that.sanitizeRegexp);
+          elementId = that.sanitize(value);
 
       selectableLi
         .data('ms-value', value)
@@ -135,14 +133,14 @@
 
       if ($optgroup.length > 0){
         var optgroupLabel = $optgroup.attr('label'),
-            optgroupId = that.sanitize(optgroupLabel, that.sanitizeRegexp),
+            optgroupId = that.sanitize(optgroupLabel),
             $selectableOptgroup = that.$selectableUl.find('#optgroup-selectable-'+optgroupId),
             $selectionOptgroup = that.$selectionUl.find('#optgroup-selection-'+optgroupId);
-        
+
         if ($selectableOptgroup.length === 0){
           var optgroupContainerTpl = '<li class="ms-optgroup-container"></li>',
               optgroupTpl = '<ul class="ms-optgroup"><li class="ms-optgroup-label"><span>'+optgroupLabel+'</span></li></ul>';
-          
+
           $selectableOptgroup = $(optgroupContainerTpl);
           $selectionOptgroup = $(optgroupContainerTpl);
           $selectableOptgroup.attr('id', 'optgroup-selectable-'+optgroupId);
@@ -162,14 +160,37 @@
           that.$selectableUl.append($selectableOptgroup);
           that.$selectionUl.append($selectionOptgroup);
         }
-        $selectableOptgroup.children().append(selectableLi);
-        $selectionOptgroup.children().append(selectedLi);
+        index = index == undefined ? $selectableOptgroup.children().length : index + 1;
+        selectableLi.insertAt(index, $selectableOptgroup.children());
+        selectedLi.insertAt(index, $selectionOptgroup.children());
       } else {
-        that.$selectableUl.append(selectableLi);
-        that.$selectionUl.append(selectedLi);
+        index = index == undefined ? that.$selectableUl.children().length : index;
+
+        selectableLi.insertAt(index, that.$selectableUl);
+        selectedLi.insertAt(index, that.$selectionUl);
       }
     },
 
+    'addOption' : function(options){
+      var that = this;
+
+      if (options.value) options = [options];
+      $.each(options, function(index, option){
+        if (option.value && that.$element.find("option[value='"+option.value+"']").length === 0){
+          var $option = $('<option value="'+option.value+'">'+option.text+'</option>'),
+              index = parseInt((typeof option.index === 'undefined' ? that.$element.children().length : option.index)),
+              $container = option.nested == undefined ? that.$element : $("optgroup[label='"+option.nested+"']")
+
+          $option.insertAt(index, $container);
+          that.generateLisFromOption($option.get(0), index, option.nested);
+        }
+      })
+    },
+
+    'escapeHTML' : function(text){
+      return $("<div>").text(text).html();
+    },
+
     'activeKeyboard' : function($list){
       var that = this;
 
@@ -187,17 +208,30 @@
             e.stopPropagation();
             that.moveHighlight($(this), (e.which === 38) ? -1 : 1);
             return;
-          case 32:
-            e.preventDefault();
-            e.stopPropagation();
-            that.selectHighlighted($list);
-            return;
           case 37:
           case 39:
             e.preventDefault();
             e.stopPropagation();
             that.switchList($list);
             return;
+          case 9:
+            if(that.$element.is('[tabindex]')){
+              e.preventDefault();
+              var tabindex = parseInt(that.$element.attr('tabindex'), 10);
+              tabindex = (e.shiftKey) ? tabindex-1 : tabindex+1;
+              $('[tabindex="'+(tabindex)+'"]').focus();
+              return;
+            }else{
+              if(e.shiftKey){
+                that.$element.trigger('focus');
+              }
+            }
+        }
+        if($.inArray(e.which, that.options.keySelect) > -1){
+          e.preventDefault();
+          e.stopPropagation();
+          that.selectHighlighted($list);
+          return;
         }
       });
     },
@@ -288,9 +322,11 @@
 
     'activeMouse' : function($list){
       var that = this;
-
+      var lastMovedDom = false;
       $list.on('mousemove', function(){
-        var elems = $list.find(that.elemsSelector);
+        if (lastMovedDom === this) return;
+				lastMovedDom = this;
+				var elems = $list.find(that.elemsSelector);
 
         elems.on('mouseenter', function(){
           elems.removeClass('ms-hover');
@@ -314,11 +350,16 @@
 
       var that = this,
           ms = this.$element,
-          msIds = $.map(value, function(val){ return(that.sanitize(val, that.sanitizeRegexp)); }),
+          msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
           selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable').filter(':not(.'+that.options.disabledClass+')'),
           selections = this.$selectionUl.find('#' + msIds.join('-selection, #') + '-selection').filter(':not(.'+that.options.disabledClass+')'),
           options = ms.find('option:not(:disabled)').filter(function(){ return($.inArray(this.value, value) > -1); });
 
+      if (method === 'init'){
+        selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable'),
+        selections = this.$selectionUl.find('#' + msIds.join('-selection, #') + '-selection');
+      }
+
       if (selectables.length > 0){
         selectables.addClass('ms-selected').hide();
         selections.addClass('ms-selected').show();
@@ -342,7 +383,10 @@
           });
         } else {
           if (that.options.keepOrder){
-            selections.insertAfter(that.$selectionUl.find('.ms-selected').last());  
+            var selectionLiLast = that.$selectionUl.find('.ms-selected'); 
+            if((selectionLiLast.length > 1) && (selectionLiLast.last().get(0) != selections.get(0))) {
+              selections.insertAfter(selectionLiLast.last());
+            }
           }
         }
         if (method !== 'init'){
@@ -359,9 +403,9 @@
 
       var that = this,
           ms = this.$element,
-          msIds = $.map(value, function(val){ return(that.sanitize(val, that.sanitizeRegexp)); }),
+          msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
           selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable'),
-          selections = this.$selectionUl.find('#' + msIds.join('-selection, #')+'-selection').filter('.ms-selected'),
+          selections = this.$selectionUl.find('#' + msIds.join('-selection, #')+'-selection').filter('.ms-selected').filter(':not(.'+that.options.disabledClass+')'),
           options = ms.find('option').filter(function(){ return($.inArray(this.value, value) > -1); });
 
       if (selections.length > 0){
@@ -428,8 +472,16 @@
       }
     },
 
-    sanitize: function(value, reg){
-      return(value.replace(reg, '_'));
+    sanitize: function(value){
+      var hash = 0, i, char;
+      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;
+        hash |= 0; // Convert to 32bit integer
+      }
+      return hash;
     }
   };
 
@@ -456,12 +508,24 @@
   };
 
   $.fn.multiSelect.defaults = {
+    keySelect: [32],
     selectableOptgroup: false,
     disabledClass : 'disabled',
     dblClick : false,
-    keepOrder: false
+    keepOrder: false,
+    cssClass: ''
   };
 
   $.fn.multiSelect.Constructor = MultiSelect;
 
-}(window.jQuery);
+  $.fn.insertAt = function(index, $parent) {
+    return this.each(function() {
+      if (index === 0) {
+        $parent.prepend(this);
+      } else {
+        $parent.children().eq(index - 1).after(this);
+      }
+    });
+}
+
+}(window.jQuery);

data/app/assets/stylesheets/multi-select.scss

@@ -1,16 +1,27 @@
 .ms-container{
-  background: transparent image-url('switch.png') no-repeat 170px 80px;
+  background: transparent image-url('switch.png') no-repeat 50% 50%;
+  width: 370px;
 }
 
 .ms-container:after{
-  content: "."; display: block; height: 0; line-height: 0; font-size: 0; clear: both; min-height: 0; visibility: hidden;
+  content: ".";
+  display: block;
+  height: 0;
+  line-height: 0;
+  font-size: 0;
+  clear: both;
+  min-height: 0;
+  visibility: hidden;
 }
 
 .ms-container .ms-selectable, .ms-container .ms-selection{
-
   background: #fff;
   color: #555555;
   float: left;
+  width: 45%;
+}
+.ms-container .ms-selection{
+  float: right;
 }
 
 .ms-container .ms-list{
@@ -26,14 +37,10 @@
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-}
-
-
-.ms-selected{
-  display:none;
-}
-.ms-container .ms-selectable{
-  margin-right: 40px;
+  position: relative;
+  height: 200px;
+  padding: 0;
+  overflow-y: auto;
 }
 
 .ms-container .ms-list.ms-focus{
@@ -55,13 +62,6 @@
   width: 100%;
 }
 
-.ms-container ul.ms-list{
-  width: 160px;
-  height: 200px;
-  padding: 0;
-  overflow-y: auto;
-}
-
 .ms-container .ms-optgroup-label{
   margin: 0;
   padding: 5px 0px 0px 5px;
@@ -90,4 +90,4 @@
   background-color: #eee;
   color: #aaa;
   cursor: text;
-}
+}

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

@@ -1,5 +1,5 @@
 module MultiSelectRails
   module Rails
-    VERSION = "0.9.8.1"
+    VERSION = "0.9.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi-select-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.8.1
+  version: 0.9.10
 platform: ruby
 authors:
 - Per Andersson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - app/assets/images/switch.png