selectivity-rails 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd41b43f08c37783717975b788ce16e47394e1f
-  data.tar.gz: 882fd6a6887214fff3d6890286d06dd4fc7e74b9
+  metadata.gz: c72d93809502d208c84e3646a8bd9a6038e8ec94
+  data.tar.gz: 01af9c1cf98f7168edbf04478c6a418827f886c3
 SHA512:
-  metadata.gz: f04f3950356f55d3ef7fc2bf678fb137240c45d8bd29480ed716fe8da8f3f85e215f73f77cf0c2c51ec37d5425c105b37fd2a625b7434a9417d7debe8103cbeb
-  data.tar.gz: e88316785228fac112e55256cbe16a291fea233d293a727f9d544840c9942aaf9a812ce8cc3698c288f33476b9b5e4a7e73fe47a3956163a07183c8d276d1012
+  metadata.gz: 6544d7e3140e111b5db9a6203a7f24e4e6b82dff755fa7330bde3c473d754469eca1efeaff133b187eab061b0dde8d9394f24bb046d4dacdadecac8b66d33d84
+  data.tar.gz: 55f4746e34b60d7bed02af63c215cba5a7aaae845b60493e37f827829f4d524d5ac7b7fc4e00c6be2dd6a912768b987fd8cb8f92acc0d93cdb7525ed4215a728

data/lib/selectivity/rails/version.rb

@@ -1,5 +1,5 @@
 module Selectivity
   module Rails
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/lib/selectivity/rspec.rb

@@ -52,8 +52,7 @@ module Selectivity
         input.click
 
         within 'div.selectivity-dropdown' do
-          # if find('div.selectivity-result-item', text: item).visible?
-          if find(:xpath, "//div[@class='selectivity-result-item'][contains(text(), '#{item}')]").visible?
+          if find('div.selectivity-result-item', text: item).visible?
             page.evaluate_script("$('div.selectivity-result-item:contains(#{item})').trigger('click')")
           end
         end

data/vendor/assets/javascripts/selectivity.js

@@ -303,7 +303,7 @@ var latestQueryNum = 0;
 Selectivity.OptionListeners.push(function(selectivity, options) {
 
     var query = options.query;
-    if (query) {
+    if (query && !query._async) {
         options.query = function(queryOptions) {
             latestQueryNum++;
             var queryNum = latestQueryNum;
@@ -322,6 +322,7 @@ Selectivity.OptionListeners.push(function(selectivity, options) {
             };
             query(queryOptions);
         };
+        options.query._async = true;
     }
 });
 
@@ -2342,6 +2343,8 @@ function SelectivityDropdown(options) {
      */
     this.selectivity = selectivity;
 
+    this._closed = false;
+
     this._closeProxy = this.close.bind(this);
     if (selectivity.options.closeOnSelect !== false) {
         selectivity.$el.on('selectivity-selecting', this._closeProxy);
@@ -2400,17 +2403,21 @@ $.extend(SelectivityDropdown.prototype, EventDelegator.prototype, {
      */
     close: function() {
 
-        if (this.options.showSearchInput) {
-            this.selectivity.removeSearchInput();
-        }
+        if (!this._closed) {
+            this._closed = true;
 
-        this.$el.remove();
+            if (this.options.showSearchInput) {
+                this.selectivity.removeSearchInput();
+            }
 
-        this.removeCloseHandler();
+            this.$el.remove();
 
-        this.selectivity.$el.off('selectivity-selecting', this._closeProxy);
+            this.removeCloseHandler();
 
-        this.triggerClose();
+            this.selectivity.$el.off('selectivity-selecting', this._closeProxy);
+
+            this.triggerClose();
+        }
     },
 
     /**
@@ -2422,8 +2429,7 @@ $.extend(SelectivityDropdown.prototype, EventDelegator.prototype, {
         'click .selectivity-load-more': '_loadMoreClicked',
         'click .selectivity-result-item': '_resultClicked',
         'mouseenter .selectivity-load-more': '_loadMoreHovered',
-        'mouseenter .selectivity-result-item': '_resultHovered',
-        'mousemove': '_recordMousePosition'
+        'mouseenter .selectivity-result-item': '_resultHovered'
     },
 
     /**
@@ -3012,8 +3018,8 @@ function listener(selectivity, $input) {
             }
 
             var top = position.top;
-            var elHeight = $el.height();
             var resultsHeight = dropdown.$results.height();
+            var elHeight = ($el.outerHeight ? $el.outerHeight() : $el.height());
             if (top < 0 || top > resultsHeight - elHeight) {
                 top += dropdown.$results.scrollTop();
                 dropdown.$results.scrollTop(delta < 0 ? top : top - resultsHeight + elHeight);

metadata

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