Merge branch 'master' of github.com:jupiterjs/phui

HendrikLouw · Sep 10, 2010 · a9a3ca8 · a9a3ca8
2 parents 94d85fd + 602ec58
commit a9a3ca8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/combobox/combobox.js b/combobox/combobox.js
@@ -313,7 +313,9 @@ steal.plugins('jquery/controller', 'jquery/lang/json', 'phui/positionable', 'phu
 		focusInputAndShowDropdown: function( el ) {
 
 			// select all text
-			el[0].focus();
+			if(el.is(":visible")){ // IE won't let you focus an invisible input
+				el[0].focus();
+			}
 			if (!this.dropdown().is(":visible") ) {
 
 				if ( this.options.overrideDropdown ) {

diff --git a/combobox/controllers/dropdown_controller.js b/combobox/controllers/dropdown_controller.js
@@ -25,7 +25,10 @@ steal.then(function() {
 		},
 		style: function() {
 
-			this.element.css("width", this.options.parentElement.width());
+			this.element.css({
+				'opacity': 1, // used because IE7 doesn't show the updated contents of the combobox without it
+				'width': this.options.parentElement.width()
+			});
 			if ( this.options.maxHeight ) {
 				var h = this.element.height(),
 					maxh = this.options.maxHeight;
@@ -136,6 +139,7 @@ steal.then(function() {
 
 		// gets an element from an item .... what
 		_getEl: function( item ) {
+			if(!item || !item.id) return $([])
 			return this.find(".dropdown_" + item.id);
 		},
 		/**