selectivity-rails 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4461c4f15d732317f7c29bfe4a3d662145fee35
-  data.tar.gz: 4381055dc91b1f0d98e308dfe2caa4eaab938acd
+  metadata.gz: f193b5755b553f98fc709e5290054ec9f02d6b19
+  data.tar.gz: e0df86c48b839a856bce58f13d4a3239416e3032
 SHA512:
-  metadata.gz: e867c641b4750b28e8f06ed2ba3bf7ee0b7a3499d8f5fc56d716dbe97989fea3456b7aa930d694b6589bdce00bf49a843a358bd7ddbaffaf5fbdb4c2e46e41d2
-  data.tar.gz: 4738e0bafd7ce4343c6e8cc64876c85132e0b4a8502e060007e46b6d5337e551ce29ef0ab6de333c9e6ac3dbffe7d1b4f6552ac9b223b2c30da72e68d1508007
+  metadata.gz: 5b70b0fe542ad62b62bc52c13004bce87aecb11c7fa15f572667c49b81f2ce2479b3f7559953730b2ce3bf8a4ef365c77bda5cb0f258eeb7fefc644b4f772ec1
+  data.tar.gz: 568502d3cb475107c5c3d2d04fb7e0656c6a27a326eb21a07f5a4b312e8e2e537bd7c83917a0d3c515ff1ffc3923ff2589b17b5ffb54f77f3d318f6526162f9a

data/README.md

@@ -108,11 +108,13 @@ selectivity_select('Poland', from: '#country')
 To handle multiple select:
 
 ```ruby
-selectivity_select('Netherlands', 'Russia', from: '#countries')
+selectivity_select('Netherlands', 'Russia', 'Spain', from: '#countries')
 # or, by single value:
-selectivity_select('Russia', from: '#countries')
+selectivity_select('Poland', from: '#countries')
 
-selectivity_unselect('Russia', from: '#countries')
+selectivity_unselect('Russia', 'Spain', from: '#countries')
+# or, by single value:
+selectivity_unselect('Netherlands', from: '#countries')
 ```
 
 ## Demos and examples

data/lib/selectivity/rails/version.rb

@@ -1,5 +1,5 @@
 module Selectivity
   module Rails
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

data/vendor/assets/javascripts/selectivity.js

@@ -2964,6 +2964,9 @@ var KEY_UP_ARROW = 38;
  */
 function listener(selectivity, $input) {
 
+    var keydownCanceled = false;
+    var closeSubmenu = null;
+
     /**
      * Moves a dropdown's highlight to the next or previous result item.
      *
@@ -3037,7 +3040,20 @@ function listener(selectivity, $input) {
 
         var dropdown = selectivity.dropdown;
         if (dropdown) {
-            if (event.keyCode === KEY_DOWN_ARROW) {
+            if (event.keyCode === KEY_BACKSPACE) {
+                if (!$input.val()) {
+                    if (dropdown.submenu) {
+                        var submenu = dropdown.submenu;
+                        while (submenu.submenu) {
+                            submenu = submenu.submenu;
+                        }
+                        closeSubmenu = submenu;
+                    }
+
+                    event.preventDefault();
+                    keydownCanceled = true;
+                }
+            } else if (event.keyCode === KEY_DOWN_ARROW) {
                 moveHighlight(dropdown, 1);
             } else if (event.keyCode === KEY_UP_ARROW) {
                 moveHighlight(dropdown, -1);
@@ -3058,18 +3074,13 @@ function listener(selectivity, $input) {
         }
 
         var dropdown = selectivity.dropdown;
-        if (event.keyCode === KEY_BACKSPACE) {
-            if (!$input.val()) {
-                if (dropdown && dropdown.submenu) {
-                    var submenu = dropdown.submenu;
-                    while (submenu.submenu) {
-                        submenu = submenu.submenu;
-                    }
-                    submenu.close();
-                    selectivity.focus();
-                }
+        if (keydownCanceled) {
+            event.preventDefault();
+            keydownCanceled = false;
 
-                event.preventDefault();
+            if (closeSubmenu) {
+                closeSubmenu.close();
+                closeSubmenu = null;
             }
         } else if (event.keyCode === KEY_ENTER && !event.ctrlKey) {
             if (dropdown) {
@@ -4283,11 +4294,11 @@ Selectivity.Templates = {
         return (
             '<span class="selectivity-multiple-selected-item' + extraClass + '" ' +
                   'data-item-id="' + escape(options.id) + '">' +
-                escape(options.text) +
                 (options.removable ? '<a class="selectivity-multiple-selected-item-remove">' +
                                          '<i class="fa fa-remove"></i>' +
                                      '</a>'
                                    : '') +
+                escape(options.text) +
             '</span>'
         );
     },
@@ -4420,8 +4431,8 @@ Selectivity.Templates = {
      *                mode - Mode in which select exists, single or multiple.
      */
     selectCompliance: function(options) {
-        if (options.mode === 'multiple' && !options.name.match(/\[\]$/)) {
-            options.name = options.name + '[]';
+        if (options.mode === 'multiple' && options.name.slice(-2) !== '[]') {
+            options.name += '[]';
         }
         return ('<select name="' + options.name + '"' + (options.mode === 'multiple' ? ' multiple' : '') + '></select>');
     },
@@ -4519,23 +4530,25 @@ var Selectivity = _dereq_(7);
 
 function replaceSelectElement($el, options) {
 
-    var value = (options.multiple ? [] : null);
+    var data = (options.multiple ? [] : null);
 
     var mapOptions = function() {
         var $this = $(this);
         if ($this.is('option')) {
-            var id = $this.attr('value') || $this.text();
+            var text = $this.text();
+            var id = $this.attr('value') || text;
             if ($this.prop('selected')) {
+                var item = { id: id, text: text };
                 if (options.multiple) {
-                    value.push(id);
+                    data.push(item);
                 } else {
-                    value = id;
+                    data = item;
                 }
             }
 
             return {
                 id: id,
-                text: $this.attr('label') || $this.text()
+                text: $this.attr('label') || text
             };
         } else {
             return {
@@ -4547,11 +4560,12 @@ function replaceSelectElement($el, options) {
 
     options.allowClear = ('allowClear' in options ? options.allowClear : !$el.prop('required'));
 
-    options.items = $el.children('option,optgroup').map(mapOptions).get();
+    var items = $el.children('option,optgroup').map(mapOptions).get();
+    options.items = (options.query ? null : items);
 
     options.placeholder = options.placeholder || $el.data('placeholder') || '';
 
-    options.value = value;
+    options.data = data;
 
     var classes = ($el.attr('class') || 'selectivity-input').split(' ');
     if (classes.indexOf('selectivity-input') === -1) {

data/vendor/assets/stylesheets/selectivity/multiple.sass

@@ -47,7 +47,7 @@ input[type='text'].selectivity-multiple-input
     float: left
     line-height: 2em
     margin: 2px
-    padding-left: 5px
+    padding-right: 5px
     position: relative
     -moz-user-select: none
     -ms-user-select: none

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selectivity-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Konrad Jurkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler