kea-rails 2.0.0.pre.alpha7 → 2.0.0.pre.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b25bf5539b381f32b9ac9e973d3e9b56fb2454ec
-  data.tar.gz: a859b774a0064aab1da30f353597bc9ac8372597
+  metadata.gz: bdf73285a8e4d06d187dd8734d0e30bb70de18c6
+  data.tar.gz: cc190abd5736d51c5ca5d78f535b3d4c9dc067e8
 SHA512:
-  metadata.gz: 1313b35eacc20fed9a39fa41d4f2f37a51892f8c1d961b775d15a8209f9389bf6798b187455e9e7c69e998df34c5b5409b918ac32974cd3147a6bd615c89d635
-  data.tar.gz: f21c516b38d87bee6a9c5648ab1223e89f0c2eda00a90b32b91a571e822f3b790b74830524771fce54a3417fbd237476f1ec71a0c391b7becf4e726715ad9735
+  metadata.gz: b33d8e41ce1305be6d623f8d0ec1db886a9f9ac4848b19e8feb87ba12c3dbd54d16e8bc79062c732389f33ddcff4a15736cf5b5dfe3f15bc8889d6e5fff0c920
+  data.tar.gz: e5d26cf01a06e13a554e9416c4b301d5f952179ae6a39251289b5c03250edf59223a889ceed5eaa76d7fc1a20d934c5e51f50c8c97bdef58f3a2caeeeb6bc36f

data/app/assets/javascripts/kea/bindings/komplete.js

@@ -4,9 +4,9 @@
   ko.bindingHandlers.komplete = {
     init: function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
       var $container    = $(element),
-          $searchInput  = $container.find('> .komplete-search-term'),
-          listener      = new window.keypress.Listener( $searchInput.get(0) ),
           options       = ko.unwrap(valueAccessor()),
+          $searchInput,
+          listener,
           AutocompleteVm,
           AutocompleteResult,
           vm,
@@ -26,13 +26,14 @@
         this.responseMap       = {label: 'label', value: 'value'};
         this.searchTerm        = ko.observable('').extend({ rateLimit: { timeout: 500, method: "notifyWhenChangesStop" } });
         this.requestInProgress = ko.observable(false);
+        this.hasFocus          = ko.observable(false);
         
         this.showDropdown      = ko.computed(function() {
-          return this.searchResults().length > 0;
+          return this.searchResults().length > 0 && this.hasFocus();
         }, this, {deferEvaluation: true});
         
         this.searchTerm.subscribe(function() {
-          if (this.searchTerm().length > 0) {
+          if (this.searchTerm() && this.searchTerm().length > 0) {
             this.fetch();
           }
         }, this);
@@ -48,7 +49,12 @@
         var currentFocus = this.focusedResult(),
             focusedIdx   = currentFocus      ? this.searchResults().indexOf(currentFocus)   : -1,
             futureFocus  = focusedIdx !== -1 ? this.searchResults()[focusedIdx + idxOffset] : null;
-            
+        
+        if (!currentFocus && this.searchResults()[0]) {
+          this.searchResults()[0].hasFocus(true);
+          return;
+        }
+           
         if (!futureFocus) { return; }
         
         currentFocus.hasFocus(false);
@@ -109,6 +115,13 @@
       
       vm = options.vm || new AutocompleteVm(options.url, options.autoSelect, options.onSelect);
       
+      if (options.observable) {
+        ko.computed(function() {
+          vm.searchTerm( options.observable() );
+          
+        }, this, { disposeWhenNodeIsRemoved: element });
+      }
+      
       if (options.fetch) {
         vm.fetch = options.fetch;
       }
@@ -121,45 +134,60 @@
         vm.parseResults = options.parseResults;
       }
       
-      listener.register_combo({
-        keys: "down",
-        on_keydown: function() { vm.focusNext(); }
-      });
-      
-      listener.register_combo({
-        keys: "up",
-        on_keydown: function() { vm.focusPrevious(); }
-      });
-      
-      listener.register_combo({
-        keys: "enter",
-        on_keydown: function() {
-          if (!options.autoSelect && !vm.focusedResult()) {
-            if (options.blurOnSelect) {
-              $searchInput.get(0).blur();
-            }
-            
-            vm.select( $searchInput.val() );
-            
-          } else if (options.autoSelect && !vm.focusedResult()) {
-            return;
-            
-          } else {
-            if (options.blurOnSelect) {
-              $searchInput.get(0).blur();
+      $container.on('componentReady', function() {
+        $searchInput = $container.find('> .komplete-search-term');
+        listener     = new window.keypress.Listener( $searchInput.get(0) );
+        
+        $searchInput.on('focus', function() {
+          vm.hasFocus(true);
+        });
+        
+        $searchInput.on('blur', function() {
+          vm.hasFocus(false);
+        });
+        
+        listener.register_combo({
+          keys: "down",
+          on_keydown: function() { vm.focusNext(); }
+        });
+        
+        listener.register_combo({
+          keys: "up",
+          on_keydown: function() { vm.focusPrevious(); }
+        });
+        
+        listener.register_combo({
+          keys: "enter",
+          on_keydown: function() {
+            if (!options.autoSelect && !vm.focusedResult()) {
+              if (options.blurOnSelect) {
+                $searchInput.get(0).blur();
+              }
+              
+              vm.select( $searchInput.val() );
+              
+            } else if (options.autoSelect && !vm.focusedResult()) {
+              return;
+              
+            } else {
+              if (options.blurOnSelect) {
+                $searchInput.get(0).blur();
+              }
+              
+              vm.select( vm.focusedResult() );
             }
-            
-            vm.select( vm.focusedResult() );
           }
-        }
-      });
-      
-      $container.on('click', function() {
-        $searchInput.focus();
+        });
+        
+        $container.on('click', function() {
+          $searchInput.focus();
+        });
       });
       
       ko.utils.domNodeDisposal.addDisposeCallback(element, function() {
-        listener.destroy();
+        if (listener) {
+          listener.destroy();
+        }
       });
       
       return ko.bindingHandlers.with.init(element, function() { return vm; }, allBindingsAccessor, viewModel, bindingContext);

data/app/assets/javascripts/kea/components/komplete-search.js

@@ -0,0 +1,20 @@
+(function(ko, $) {
+  "use strict";
+
+  ko.components.register('komplete-search', {
+      viewModel: function(params) {
+        this.mandatory = typeof params.mandatory === 'undefined' ? false : params.mandatory;
+        this.options   = params.options || {};
+      },
+      template:
+        '<div data-bind="komplete: options" class="komplete">' +
+          '<!-- ko template: { nodes: $componentTemplateNodes, afterRender: function(children) { $(children).parent().trigger("componentReady"); } } --><!-- /ko -->' +
+          '<div data-bind="visible: showDropdown" class="komplete-dropdown">' +
+            '<ul data-bind="foreach: searchResults">' +
+              '<li data-bind="text: label, click: $parent.select.bind($parent, $data), css: { \'has-focus\': hasFocus }, clickBubble: false"></li>' +
+            '</ul>' +
+          '</div>' +
+        '</div>'
+  });
+
+})(ko, $);

data/app/assets/javascripts/kea/overlay/overlay_control.js

@@ -73,7 +73,16 @@
     };
     
     this.hide = function hide() {
+      // that.runCallbacks('beforeClose');
+      // that.veil.hide();
+      that.hideAndRemove();
+    };
+    
+    this.hideAndRemove = function hideAndRemove() {
       that.runCallbacks('beforeClose');
+      that.veil.addCallback('afterHide', function() {
+        that.veil.destroy();
+      });
       that.veil.hide();
     };
     

data/app/assets/javascripts/kea/sherlock/base_provider.js

@@ -125,6 +125,10 @@
     return fragment;
   };
   
+  Base.prototype.resetLiveSearch = function resetLiveSearch() {
+    this.liveSearchFragments.removeAll();
+  };
+  
   Base.prototype.defaultFragment = function defaultFragment() {
     return new this.Fragment(this, this.displayName, 1);
   };

data/app/assets/javascripts/kea/viewmodels/sherlock.js

@@ -205,10 +205,11 @@
           
           if (fragments) {
             fragments.forEach(function(fragment) { that.fragmentsForSearchTerm.push(fragment); });
-            fragments[0].hasFocus(true);
           }
         });
         
+        // fragments[0].hasFocus(true);
+        
       } else {
         if (that.providerSearchActive()) {
           that.setDefaultFragments();
@@ -224,6 +225,11 @@
       
       if (that.fragmentsForSearchTerm().length === 0) {
         that.setDefaultFragments();
+        that.showLiveSearchWidgets(false);
+        
+        that.liveSearchProviders().forEach(function(provider) {
+          provider.resetLiveSearch();
+        });
       }
     });
     

data/lib/kea-rails/version.rb

@@ -1,3 +1,3 @@
 module Kea
-  VERSION = "2.0.0-alpha7"
+  VERSION = "2.0.0-alpha8"
 end

data/vendor/assets/components/attachejs/attache.js

@@ -26,6 +26,8 @@
    * @param {Number} [options.offsetX=10] - the horizontal distance between anchor and popover in px
    * @param {Number} [options.offsetY=10] - the vertical distance between anchor and popover in px
    * @param {String} [options.popoverClass] - additional CSS class(es) to apply to the popover markup
+   * @param {String,Function} [options.appendTo] - where to insert the popover markup - either 'body', 'afterElement', or a callback that
+   *                                                takes the markup as a parameter and inserts it
    * @param {Boolean} [options.debug=false] - provide debug information and error handling in the console
    *
    * @param {Object} [callbacks] - callbacks to be triggered at various lifecycle moments
@@ -160,6 +162,7 @@
       offsetX: 10,
       offsetY: 10,
       popoverClass: "",
+      appendTo: 'body',
       cssTransitionSupport: true,
       allowParallelUse: true,
       disposable: false,
@@ -269,7 +272,16 @@
 
       this.$popover.html(this.content);
 
-      $('body').append(this.$popover);
+      if (this.options.appendTo === 'body') {
+        $('body').append(this.$popover);
+        
+      } else if (this.options.appendTo === 'afterElement') {
+        this.$anchorElement.after(this.$popover);
+        
+      } else if (typeof this.options.appendTo === 'function') {
+        this.options.appendTo(this.$popover);
+      }
+      
       _executeCallbacksFor.call(this, 'afterCreate', this.$anchorElement, this.$popover);
     };
     

data/vendor/assets/components/attachejs/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "attachejs",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "homepage": "https://github.com/janfoeh/attachejs",
   "authors": [
     "Jan-Christian Foeh <jan@programmanstalt.de>"

data/vendor/assets/components/veiljs/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "veiljs",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "homepage": "https://github.com/janfoeh/veiljs",
   "authors": [
     "Jan-Christian Foeh <jan@programmanstalt.de>"

data/vendor/assets/components/veiljs/veil.js

@@ -268,8 +268,9 @@
 
       if (this.options.listenToCustomEvents) {
         this.$overlay.off('hide.veil');
-        _executeCallbacksFor.call(this, 'afterHide', this.$overlay);
       }
+      
+      _executeCallbacksFor.call(this, 'afterHide', this.$overlay);
     };
 
     /**

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kea-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha7
+  version: 2.0.0.pre.alpha8
 platform: ruby
 authors:
 - Jan-Christian Foeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,6 +45,7 @@ files:
 - app/assets/javascripts/kea/bindings/validation_state.js
 - app/assets/javascripts/kea/bindings/wait_for_vm.js
 - app/assets/javascripts/kea/components/confirmation_button.js
+- app/assets/javascripts/kea/components/komplete-search.js
 - app/assets/javascripts/kea/extenders/date.js
 - app/assets/javascripts/kea/extenders/equals.js
 - app/assets/javascripts/kea/extenders/external_validator.js