Merge pull request #131 from Guy--L/master

thephw · thephw · commit 13362e395efa · 2014-05-13T14:03:09.000-04:00
Prevent dropdown from disappearing when mouse downed on scrollbar.
diff --git a/js/bootstrap-combobox.js b/js/bootstrap-combobox.js
@@ -136,12 +136,16 @@
         })
         .show();
 
+      $('.dropdown-menu').on('mousedown', $.proxy(this.scrollSafety, this));
+
       this.shown = true;
       return this;
     }
 
   , hide: function () {
       this.$menu.hide();
+      $('.dropdown-menu').off('mousedown', $.proxy(this.scrollSafety, this));
+      this.$element.on('blur', $.proxy(this.blur, this));
       this.shown = false;
       return this;
     }
@@ -254,6 +258,11 @@
     }
   }
 
+  , scrollSafety: function(e) {
+      if (e.target.tagName == 'UL') {
+          this.$element.off('blur');
+      }
+  }
   , clearElement: function () {
     this.$element.val('').focus();
   }

Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,16 @@`
`136`	`136`	`})`
`137`	`137`	`.show();`
`138`	`138`
	`139`	`+ $('.dropdown-menu').on('mousedown', $.proxy(this.scrollSafety, this));`
	`140`	`+`
`139`	`141`	`this.shown = true;`
`140`	`142`	`return this;`
`141`	`143`	`}`
`142`	`144`
`143`	`145`	`, hide: function () {`
`144`	`146`	`this.$menu.hide();`
	`147`	`+ $('.dropdown-menu').off('mousedown', $.proxy(this.scrollSafety, this));`
	`148`	`+ this.$element.on('blur', $.proxy(this.blur, this));`
`145`	`149`	`this.shown = false;`
`146`	`150`	`return this;`
`147`	`151`	`}`
`@@ -254,6 +258,11 @@`
`254`	`258`	`}`
`255`	`259`	`}`
`256`	`260`
	`261`	`+ , scrollSafety: function(e) {`
	`262`	`+ if (e.target.tagName == 'UL') {`
	`263`	`+ this.$element.off('blur');`
	`264`	`+ }`
	`265`	`+ }`
`257`	`266`	`, clearElement: function () {`
`258`	`267`	`this.$element.val('').focus();`
`259`	`268`	`}`