selectivity-rails 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12bba095be68adb4523924a49a6804b389d229fd
-  data.tar.gz: 0d417bacef4d2cd0fcc1a1ca4c21064c1a209df6
+  metadata.gz: 34ad4f9ee657c8b9a129e0d85269e4bcfc371351
+  data.tar.gz: 46e914da3aef1d3efd779c242c6a52f525b77c0f
 SHA512:
-  metadata.gz: ada0f90e0d2e387dc65862680ff1df5ca1d8e64252c1160b32ca3628769c26c4d09eaf8a4b4e4fca7fca0c6303fff8e749f1d2f39bb4631c1e0372b6f2b04879
-  data.tar.gz: 623634c373277a61f9a7a0b0133b8bd1032885ceed8c034e6cf47dc759ba2b4867e677bf3c623d458de31dbf8aa424d85491a638b6b889d8a7398f807d208797
+  metadata.gz: 9a57ab8f4c34bbe85f32a14f466a75d5c9e33c1dccb45bea9becf6733b6bffbd5da6879bcf15e12cd59fdd16f6cc6f81a5eb0238a849f756e601a0b3f1b25d7c
+  data.tar.gz: e6018c41fea9a6aecbfa18976b642393aba6bf3987b547f6c8850ecf77457c89d2249c7fc0bd91d455136f85f1b11da89472822b398f9c55419c6796f5c57d61

data/lib/selectivity/rails/version.rb

@@ -1,5 +1,5 @@
 module Selectivity
   module Rails
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/lib/selectivity/rspec.rb

@@ -55,7 +55,7 @@ module Selectivity
           element = if page.driver.class.name =~ /poltergeist/i
                       find('div.selectivity-result-item', text: item)
                     else
-                      find(:xpath, "//div[@class='selectivity-result-item'][contains(text(), '#{item}')]")
+                      find(:xpath, ".//div[contains(@class,'selectivity-result-item')][text()='#{item}']")
                     end
 
           if element.visible?

data/vendor/assets/javascripts/selectivity.js

@@ -254,7 +254,7 @@ Selectivity.OptionListeners.unshift(function(selectivity, options) {
             } else {
                 selectivity.dropdown.showLoading();
 
-                var url = (ajax.url instanceof Function ? ajax.url() : ajax.url);
+                var url = (ajax.url instanceof Function ? ajax.url(queryOptions) : ajax.url);
                 if (params) {
                     url += (url.indexOf('?') > -1 ? '&' : '?') + $.param(params(term, offset));
                 }
@@ -383,10 +383,11 @@ var EventDelegator = _dereq_(2);
  * @param methodName Optional name of a method to call. If omitted, a Selectivity instance is
  *                   created for each element in the set of matched elements. If an element in the
  *                   set already has a Selectivity instance, the result is the same as if the
- *                   setOptions() method is called.
- * @param options Optional options object to pass to the given method or the constructor. See the
- *                documentation for the respective methods to see which options they accept. In case
- *                a new instance is being created, the following property is used:
+ *                   setOptions() method is called. If a method name is given, the options
+ *                   parameter is ignored and any additional parameters are passed to the given
+ *                   method.
+ * @param options Options object to pass to the constructor or the setOptions() method. In case
+ *                a new instance is being created, the following properties are used:
  *                inputType - The input type to use. Default input types include 'Multiple' and
  *                            'Single', but you can add custom input types to the InputTypes map or
  *                            just specify one here as a function. The default value is 'Single',
@@ -401,6 +402,7 @@ var EventDelegator = _dereq_(2);
 function selectivity(methodName, options) {
     /* jshint validthis: true */
 
+    var methodArgs = Array.prototype.slice.call(arguments, 1);
     var result;
 
     this.each(function() {
@@ -408,13 +410,13 @@ function selectivity(methodName, options) {
 
         if (instance) {
             if ($.type(methodName) !== 'string') {
-                options = methodName;
+                methodArgs = [methodName];
                 methodName = 'setOptions';
             }
 
             if ($.type(instance[methodName]) === 'function') {
                 if (result === undefined) {
-                    result = instance[methodName].call(instance, options);
+                    result = instance[methodName].apply(instance, methodArgs);
                 }
             } else {
                 throw new Error('Unknown method: ' + methodName);
@@ -3102,6 +3104,8 @@ function listener(selectivity, $input) {
                 setTimeout(function() {
                     selectivity.close({ keepFocus: false });
                 }, 1);
+            } else if (event.keyCode === KEY_ENTER) {
+                event.preventDefault(); // don't submit forms on keydown
             }
         }
     }
@@ -3666,7 +3670,7 @@ var callSuper = Selectivity.inherits(MultipleSelectivity, {
 
         if (event.added || event.removed) {
             if (this.dropdown) {
-                this.dropdown.showResults(this.filterResults(this.results), {
+                this.dropdown.showResults(this.filterResults(this.dropdown.results), {
                     hasMore: this.dropdown.hasMore
                 });
             }
@@ -4646,28 +4650,28 @@ function bindTraditionalSelectEvents(selectivity) {
     var $el = selectivity.$el;
 
     $el.on('selectivity-init', function(event, mode) {
-
-            $el.append(selectivity.template('selectCompliance', {name: $el.attr('data-name'), mode: mode}))
-              .removeAttr('data-name');
-        })
-        .on('selectivity-init change', function() {
-            var data = selectivity._data;
-            var $select = $el.find('select');
-
-            if (data instanceof Array) {
-                $select.empty();
-
-                data.forEach(function(item) {
-                    $select.append(selectivity.template('selectOptionCompliance', item));
-                });
+        $el.append(selectivity.template('selectCompliance', {
+            mode: mode,
+            name: $el.attr('data-name')
+        })).removeAttr('data-name');
+    }).on('selectivity-init change', function() {
+        var data = selectivity._data;
+        var $select = $el.find('select');
+
+        if (data instanceof Array) {
+            $select.empty();
+
+            data.forEach(function(item) {
+                $select.append(selectivity.template('selectOptionCompliance', item));
+            });
+        } else {
+            if (data) {
+                $select.html(selectivity.template('selectOptionCompliance', data));
             } else {
-                if (data) {
-                    $select.html(selectivity.template('selectOptionCompliance', data));
-                } else {
-                    $select.empty();
-                }
+                $select.empty();
             }
-        });
+        }
+    });
 }
 
 /**

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selectivity-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Konrad Jurkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler