bootstrap-combobox 1.2.5 → 1.2.6

data/lib/bootstrap-combobox/version.rb

@@ -1,7 +1,6 @@
 module Bootstrap
   module Combobox 
     # This version is a little arbitrary; at time of this writing source fork is at 1.1-WIP?   
-    # If you update this, also update the version in bootstrap-combobox.js (and vice-versa).
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
   end
 end

data/vendor/assets/javascripts/bootstrap-combobox.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-combobox.js v1.2.5
+ * bootstrap-combobox.js v1.1.3
  * =============================================================
  * Copyright 2012 Daniel Farrell
  *
@@ -29,7 +29,6 @@
     this.$button = this.$container.find('.dropdown-toggle')
     this.$menu = $(this.options.menu).appendTo('body')
     this.matcher = this.options.matcher || this.matcher
-    this.updater = this.options.updater || this.updater
     this.sorter = this.options.sorter || this.sorter
     this.highlighter = this.options.highlighter || this.highlighter
     this.shown = false
@@ -129,15 +128,9 @@
   // modified typeahead function adding container and target handling
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
-      var mapped_val = this.map[val]
-      if (!this.options.force_match  && this.query != '' && !this.matcher(val)) {
-        val = this.query
-        this.$menu.find('.active').removeClass('active')
-        mapped_val = val
-      }
       this.$element.val(this.updater(val)).trigger('change')
-      this.$source.val(mapped_val).trigger('change')
-      this.$target.val(mapped_val).trigger('change')
+      this.$source.val(this.map[val]).trigger('change')
+      this.$target.val(this.map[val]).trigger('change')
       this.$container.addClass('combobox-selected')
       this.selected = true
       return this.hide()
@@ -209,14 +202,10 @@
       var that = this
       this.focused = false
       var val = this.$element.val()
-      if (!!this.options.force_match) {
-          if ( !this.selected && val !== '' ) {
-              this.$element.val('')
-              this.$source.val('').trigger('change')
-              this.$target.val('').trigger('change')
-          }
-      } else {
-          this.select();
+      if (!this.selected && val !== '' ) {
+        this.$element.val('')
+        this.$source.val('').trigger('change')
+        this.$target.val('').trigger('change')
       }
       if (!this.mousedover && this.shown) setTimeout(function () { that.hide() }, 200)
     }
@@ -244,7 +233,6 @@
   template: '<div class="combobox-container"><input type="hidden" /><input type="text" autocomplete="off" /><span class="add-on btn dropdown-toggle" data-dropdown="dropdown"><span class="caret"/><span class="combobox-clear"><i class="icon-remove"/></span></span></div>'
   , menu: '<ul class="typeahead typeahead-long dropdown-menu"></ul>'
   , item: '<li><a href="#"></a></li>'
-  , force_match: true
   }
 
   $.fn.combobox.Constructor = Combobox

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-combobox
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+date: 2014-02-18 00:00:00.000000000 Z
+dependencies: []
 description: Combobox for Bootstrap, based on Bootstrap typeahead
 email:
 - danielfarrell76@gmail.com
@@ -62,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Combobox for Bootstrap, based on Bootstrap typeahead