selectivity-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58e09b754ba44eb93296962ee65fbe033c0bff39
-  data.tar.gz: 376445a768766dab8cd7114df1c4835f60e7f18a
+  metadata.gz: 7cd41b43f08c37783717975b788ce16e47394e1f
+  data.tar.gz: 882fd6a6887214fff3d6890286d06dd4fc7e74b9
 SHA512:
-  metadata.gz: 2456e51fa9d51d274baf7d0c27fd5edcf0039372a8c84c7ec79361f52345a5f318d50e4c0e25b1ec0444e27fcdfb7cb816ff046b23d0445902d3aab8e7dbef64
-  data.tar.gz: ca842a32f3e8cf0f77be4e2ad5c41564aa346e4db102a80a6aba660feef0d2c31e835e45154d78b1d6f85a07644cf574d0bb65fff68201a991e35e809c58ba5d
+  metadata.gz: f04f3950356f55d3ef7fc2bf678fb137240c45d8bd29480ed716fe8da8f3f85e215f73f77cf0c2c51ec37d5425c105b37fd2a625b7434a9417d7debe8103cbeb
+  data.tar.gz: e88316785228fac112e55256cbe16a291fea233d293a727f9d544840c9942aaf9a812ce8cc3698c288f33476b9b5e4a7e73fe47a3956163a07183c8d276d1012

data/app/assets/stylesheets/selectivity_bootstrap.sass

@@ -31,5 +31,14 @@ $input-border: #ccc !default
     top: 0.5em
 
 
+.form-horizontal
+  .form-control.selectivity-input
+    padding-left: 0
+    padding-right: 0
+
+    .selectivity-single-result-container
+      padding-left: 6px
+
+
 .selectivity-dropdown
   margin-top: 2px

data/lib/selectivity/rails/version.rb

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

data/lib/selectivity/rspec.rb

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

data/vendor/assets/javascripts/selectivity.js

@@ -2353,8 +2353,6 @@ function SelectivityDropdown(options) {
     this.position();
     this.setupCloseHandler();
 
-    this._scrolledProxy = debounce(this._scrolled.bind(this), 50);
-
     this._suppressMouseWheel();
 
     if (options.showSearchInput) {
@@ -2364,6 +2362,8 @@ function SelectivityDropdown(options) {
 
     EventDelegator.call(this);
 
+    this.$results.on('scroll touchmove touchend', debounce(this._scrolled.bind(this), 50));
+
     this.showLoading();
 
     setTimeout(this.triggerOpen.bind(this), 1);
@@ -2744,29 +2744,6 @@ $.extend(SelectivityDropdown.prototype, EventDelegator.prototype, {
         }
     },
 
-    /**
-     * @private
-     */
-    _scrollToHighlight: function(options) {
-
-        var el;
-        if (this.highlightedResult) {
-            var quotedId = Selectivity.quoteCssAttr(this.highlightedResult.id);
-            el = this.$('.selectivity-result-item[data-item-id=' + quotedId + ']')[0];
-        } else if (this.loadMoreHighlighted) {
-            el = this.$('.selectivity-load-more')[0];
-        } else {
-            return; // no highlight to scroll to
-        }
-
-        var rect = el.getBoundingClientRect(),
-            containerRect = this.$results[0].getBoundingClientRect();
-
-        if (rect.top < containerRect.top || rect.bottom > containerRect.bottom) {
-            el.scrollIntoView(options.alignToTop);
-        }
-    },
-
     /**
      * @private
      */
@@ -3019,21 +2996,27 @@ function listener(selectivity, $input) {
         }
 
         function scrollToHighlight() {
-            var el;
+            var $el;
             if (dropdown.highlightedResult) {
                 var quotedId = Selectivity.quoteCssAttr(dropdown.highlightedResult.id);
-                el = dropdown.$('.selectivity-result-item[data-item-id=' + quotedId + ']')[0];
+                $el = dropdown.$('.selectivity-result-item[data-item-id=' + quotedId + ']');
             } else if (dropdown.loadMoreHighlighted) {
-                el = dropdown.$('.selectivity-load-more')[0];
+                $el = dropdown.$('.selectivity-load-more');
             } else {
                 return; // no highlight to scroll to
             }
 
-            var rect = el.getBoundingClientRect(),
-                containerRect = dropdown.$results[0].getBoundingClientRect();
+            var position = $el.position();
+            if (!position) {
+                return;
+            }
 
-            if (rect.top < containerRect.top || rect.bottom > containerRect.bottom) {
-                el.scrollIntoView(delta < 0);
+            var top = position.top;
+            var elHeight = $el.height();
+            var resultsHeight = dropdown.$results.height();
+            if (top < 0 || top > resultsHeight - elHeight) {
+                top += dropdown.$results.scrollTop();
+                dropdown.$results.scrollTop(delta < 0 ? top : top - resultsHeight + elHeight);
             }
         }
 

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

@@ -21,6 +21,7 @@
 .selectivity-results-container
     max-height: 28em
     overflow: auto
+    position: relative
 
 .selectivity-load-more,
 .selectivity-result-item

metadata

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