assoc_whisperer 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 560ba60c23716d32676b7fad089a78bb3564acce
-  data.tar.gz: 56bf2e3a493c9e96bca65ea408dc5f515d97a590
+  metadata.gz: b2960496ba2056b1cbdaa67fa844d589f6d99e16
+  data.tar.gz: 974d3d0c13f0076d4a9999939b2f174179e6dfea
 SHA512:
-  metadata.gz: e79e15a365f8db2031de3ed1d3daf7b8a68477be0e5daa039739be214b16172e8a90f0de9356255ff5dc9b416ab5f09d7a8b7f85a7968da911d93756da46c2a5
-  data.tar.gz: 8a89817479453e08c83062b5506199fbaf160317fcab33f22b0d1cf68e319a3191ce7c6369e46d24e4f2d69f4e0713588bc07b23e05f4854b059b15dbb6eeefe
+  metadata.gz: 8bd9f8f5160f64f80771260787bc1d6c8cc29bf75f534ddd42401a035a60b6b2979194cb70af5f517938b4e83066fd942e8c3cc212e0c45b989b7d4c00a0f7ad
+  data.tar.gz: d041b0693d85f550207a0ee1a9ffc48e7ce7e5206a5471831477c1ed25b4e572a9bfb45b34f5fbb914497162d6239d817ec8abe6fff0265bf2a86e5463f54a92

data/app/assets/javascripts/assoc_whisp.js

@@ -60,13 +60,13 @@ document.AssocWhisperer = (function () {
                 }
                 _timer = setTimeout(function () {
                     if (w.client_side) {
-                        if (!w.full_data) querry.call(w, null, function (html_text) {
+                        if (!w.full_data) query(w, null, function (html_text) {
                             w.full_data = $(html_text);
-                            digest(input_text);
+                            showList(digest(input_text));
                         });
-                        else digest(input_text);
+                        else showList(digest(input_text));
                     }
-                    else querry.call(w, input_text, function (html_text) {
+                    else query(w, input_text, function (html_text) {
                         showList($(html_text));
                     });
                 }, 700);
@@ -76,31 +76,29 @@ document.AssocWhisperer = (function () {
         _nodes.text_field.focus(function(){ w.focused = true; });
         _nodes.text_field.blur(function(){ onBlur(); });
         el.children('.dropdown_button').on('click', function(){
+            var f;
             if (_timer) clearTimeout(_timer);
             if (w.client_side) {
-                function f () {
+                f = function () {
                     var input_text;
                     if (w.filled) showList(w.full_data);
                     else {
                         input_text = _nodes['text_field'].val();
-                        digest(input_text==='' ? null : input_text);
+                        showList(digest(input_text==='' ? null : input_text));
                     }
                     _nodes['list'].focus();
-                }
-                if (!w.full_data) querry.call(w, null, function (html_text) {
+                };
+                if (!w.full_data) query(w, null, function (html_text) {
                     w.full_data = $(html_text);
                     f();
                 });
                 else f();
             }
             else {
-                if (w.filled) querry.call(w, null, function (html_text) {
-                    showList($(html_text));
-                });
-                else querry.call(w, _nodes['text_field'].val(), function (html_text) {
+                query(w, (w.filled ? null : _nodes['text_field'].val()), function (html_text) {
                     showList($(html_text));
+                    _nodes['list'].focus();
                 });
-                _nodes['list'].focus();
             }
         });
 
@@ -115,7 +113,7 @@ document.AssocWhisperer = (function () {
                         narrowed_list.append($(this).clone());
                 });
             }
-            showList(narrowed_list);
+            return narrowed_list;
         }
 
         // Attaches a List sent by html string within Whisperer's tag. Positions it underneath the text field.
@@ -176,16 +174,21 @@ document.AssocWhisperer = (function () {
     });
 
     // Actual ajax request for given input
-    function querry (input, on_success) {
-        var w = this;
-        klass.querrying = true;
+    function query (w, input, on_success) {
+        var btn;
+        klass.querying = true;
+        btn = w.nodes['base'].find('.dropdown_button');
+        btn.addClass('querying');
         $.ajax(w.url, {
                 type: 'GET',
                 dataType: 'html',
                 data: {data_action: w.action, input: (input||'')},
                 error: function () { w.removeList(); },
                 success: on_success,
-                complete: function () { klass.querrying = false; }
+                complete: function () {
+                    klass.querying = false;
+                    btn.removeClass('querying');
+                }
             }
         );
     }
@@ -195,7 +198,7 @@ document.AssocWhisperer = (function () {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-    klass = Object.create(Object, {querrying: {value: false, writable: true}});
+    klass = Object.create(Object, {querying: {value: false, writable: true}});
 
     // Return a Whisperer instance by its data-action attribute.
     function findWhisperer(action) {
@@ -219,7 +222,7 @@ document.AssocWhisperer = (function () {
         value: function (text, whisp_action) {
             var w;
             w = findWhisperer(whisp_action);
-            querry.call(w, text, function (html_text) {
+            query(w, text, function (html_text) {
                 w.select($(html_text).find('div:contains("'+text+'")'));
             });
         }
@@ -231,7 +234,7 @@ document.AssocWhisperer = (function () {
         value: function (value, whisp_action) {
             var w;
             w = findWhisperer(whisp_action);
-            querry.call(w, null, function (html_text) {
+            query(w, null, function (html_text) {
                 switch (value) {
                     case '#1':
                         w.select($(html_text).find('div:first'));

data/app/assets/stylesheets/assoc_whisp_example.css

@@ -24,6 +24,12 @@
     user-select: none;
     cursor: default;
 }
+.assoc_whisperer .querying {
+    background-image: url("assoc_whisp_querying.gif");
+    background-size: contain;
+    background-repeat: no-repeat;
+    color: rgba(0, 0, 0, 0);
+}
 .assoc_whisperer .list {
     max-height: 300px;
     overflow-y: scroll;

data/lib/assoc_whisperer/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module AssocWhisperer
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assoc_whisperer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ondřej Želazko
@@ -51,6 +51,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/images/assoc_whisp_querying.gif
 - app/assets/javascripts/assoc_whisp.js
 - app/assets/stylesheets/assoc_whisp_example.css
 - app/helpers/action_view/helpers/assoc_whisperer_helper.rb