assoc_whisperer 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c12d3a84dff2b3fcedf60c2abd790d235626c566
-  data.tar.gz: aacfc5036d39c470b1301cc6b7f853f0dded41d0
+  metadata.gz: 27b9b727c24d4854931accf16f95b6a7e5a37057
+  data.tar.gz: 43ecbae14277e0a36f996810f630c2ddce36ce82
 SHA512:
-  metadata.gz: 760054c15cc9fc0aea5357f11db45cfb81e5245a3747f574ba6fccc1abeb3a50aac045d17a08e26a09122f238e5744ea18239fb4775977ef388cc82bc481c9ce
-  data.tar.gz: 6309409f36c8087a4460dc542eaaf2b3d05fa1850f0df4cd5f2d20a4dd145eb97812a5cd4eafb542d946b9f9658576e0233bfb9c0f4917f75e33d0c45939c3bc
+  metadata.gz: 920c4fa5f5ddf259352295b986077d31642efa307da7ced452693d9df971637dd9d24b1b9254d3ad703eb6346fd1cd09b863a7aaa791c6ee5ef05e44a50ef186
+  data.tar.gz: 57e24abab50e7e490d7c5ac592920b6014c2fe92f3262205632d3a731bbcda1e0cf60fd3e6d11636f7964be620a8b9bb1d00033e43d5b907a67f01e763bf8743

data/app/assets/javascripts/assoc_whisp.js

@@ -22,6 +22,7 @@ document.AssocWhisperer = (function () {
             base: el,
             text_field: el.children('.text_field'),
             value_field: el.children('.value_field'),
+            dropdown_button: el.children('.dropdown_button'),
             list: null
         };
         opts = el.data('opts');
@@ -32,7 +33,7 @@ document.AssocWhisperer = (function () {
         w = Object.create(proto, {
             nodes: {value: _nodes},
             focused: {value: false, writable: true},
-            filled: {value: _nodes['value_field'].val()!=='', writable: true},
+            filled: {value: _nodes.value_field.val()!=='', writable: true},
             // setting
             action: {value: opts['action']},
             params: {value: opts['params']}
@@ -56,17 +57,17 @@ document.AssocWhisperer = (function () {
             if (_timer) clearTimeout(_timer);
             if (w.filled) {
                 w.filled = false;
-                _nodes['value_field'].val('');
-                _nodes['text_field'].addClass('unfilled');
+                _nodes.value_field.val('');
+                _nodes.text_field.addClass('unfilled');
             }
 
-            input_text = _nodes['text_field'].val();
+            input_text = _nodes.text_field.val();
             if (input_text==='') {
                 w.removeList();
             }
             else {
-                if (_nodes['list']) {
-                    _nodes['list'].addClass('invalid');
+                if (_nodes.list) {
+                    _nodes.list.addClass('invalid');
                 }
                 _timer = setTimeout(function () {
                     if (w.client_side) {
@@ -82,10 +83,10 @@ document.AssocWhisperer = (function () {
                 }, 700);
             }
         });
-        _nodes.text_field.on('click', function(){ _nodes['text_field'].select(); });
+        _nodes.text_field.on('click', function(){ _nodes.text_field.select(); });
         _nodes.text_field.focus(function(){ w.focused = true; });
         _nodes.text_field.blur(function(){ onBlur(); });
-        el.children('.dropdown_button').on('click', function(){
+        _nodes.dropdown_button.on('click', function(){
             var f;
             if (_timer) clearTimeout(_timer);
             if (w.client_side) {
@@ -93,10 +94,10 @@ document.AssocWhisperer = (function () {
 //                    var input_text;
 //                    if (w.filled) showList(w.full_data);
 //                    else {
-//                        input_text = _nodes['text_field'].val();
+//                        input_text = _nodes.text_field.val();
 //                        showList(digest(input_text==='' ? null : input_text));
 //                    }
-//                    _nodes['list'].focus();
+//                    _nodes.list.focus();
 //                };
 //                if (!w.full_data) query(w, null, function (html_text) {
 //                    w.full_data = $(html_text);
@@ -105,13 +106,13 @@ document.AssocWhisperer = (function () {
 //                else f();
             }
             else {
-                query(w, (w.filled ? null : _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();
                 });
             }
         });
-        el.children('.dropdown_button').removeClass('querying'); // css class is set, hence gif gets pre-loaded
+        _nodes.dropdown_button.removeClass('querying'); // css class is set, hence gif gets pre-loaded
 
 //        // For local full_data finds matching rows and shows them.
 //        function digest(input_text) {
@@ -129,19 +130,16 @@ document.AssocWhisperer = (function () {
 
         // Attaches a List sent by html string within Whisperer's tag. Positions it underneath the text field.
         function showList (list) {
-            var base_dom;
             w.removeList();
 
-            _nodes['list'] = list;
-
-            base_dom = _nodes['base'];
-            list.css('min-width', base_dom.width());
-            list.css('left', base_dom.offset().left);
-            list.css('top', base_dom.position().top + base_dom.outerHeight());
+            list.css('min-width', _nodes.base.width());
+            list.css('left', _nodes.base.offset().left);
+            list.css('top', _nodes.base.position().top + _nodes.base.outerHeight());
             list.focus(function(){ w.focused = true; });
             list.blur(function(){ onBlur(); });
-            base_dom.append(list);
+            _nodes.base.append(list);
 
+            _nodes.list = list;
             list.find('div').on('click', function(el){ w.select($(el.currentTarget)); });
         }
 
@@ -163,9 +161,9 @@ document.AssocWhisperer = (function () {
     // Removes the List should there be any.
     Object.defineProperty(proto, 'removeList', {
         value: function () {
-            if (this.nodes['list']) {
-                this.nodes['list'].detach();
-                this.nodes['list'] = null
+            if (this.nodes.list) {
+                this.nodes.list.detach();
+                this.nodes.list = null
             }
         }
     });
@@ -176,9 +174,9 @@ document.AssocWhisperer = (function () {
             var text;
             if (row.length!==1) return;
             text = row.text();
-            this.nodes['text_field'].val(text);
-            this.nodes['text_field'].removeClass('unfilled');
-            this.nodes['value_field'].val(row.attr('data-value'));
+            this.nodes.text_field.val(text);
+            this.nodes.text_field.removeClass('unfilled');
+            this.nodes.value_field.val(row.attr('data-value'));
             this.filled = true;
             this.removeList();
         }
@@ -186,10 +184,8 @@ document.AssocWhisperer = (function () {
 
     // Actual ajax request for given input
     function query (w, input, on_success) {
-        var btn;
         klass.querying = true;
-        btn = w.nodes['base'].find('.dropdown_button');
-        btn.addClass('querying');
+        w.nodes.dropdown_button.addClass('querying');
         w.params['input'] = input;
         $.ajax(w.action, {
                 type: 'GET',
@@ -199,7 +195,7 @@ document.AssocWhisperer = (function () {
                 success: on_success,
                 complete: function () {
                     klass.querying = false;
-                    btn.removeClass('querying');
+                    w.nodes.dropdown_button.removeClass('querying');
                 }
             }
         );
@@ -224,7 +220,7 @@ document.AssocWhisperer = (function () {
     // Sets a value to Whisperer
     Object.defineProperty(klass, 'setValueFor', {
         value: function (value, whisp_action) {
-            findWhisperer(whisp_action).nodes['value_field'].val(value);
+            findWhisperer(whisp_action).nodes.value_field.val(value);
         }
     });
 

data/assoc_whisperer.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   # spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   # spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  # spec.add_development_dependency 'cucumber'
+  # spec.add_development_dependency 'capybara-webkit'
 end

data/lib/assoc_whisperer/template.rb

@@ -7,6 +7,7 @@ module AssocWhisperer
     def initialize(action, opts={})
       @action = action[0]=='/' ? action : "#{AssocWhisperer.def_url}/#{action}"
       @opts = opts
+      @opts[:dropdown_button] = true if @opts[:dropdown_button].nil?
     end
 
     def params(params)
@@ -63,6 +64,7 @@ module AssocWhisperer
     end
 
     def dropdown_button_tag
+      return '' unless @opts[:dropdown_button].is_a? TrueClass
       "<span class=\"dropdown_button querying\">\u25BE</span>"
     end
 

data/lib/assoc_whisperer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assoc_whisperer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Ondřej Želazko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Rails tag assoc_whisperer for forms