Author: abelevich Date: 2010-10-13 06:01:15 -0400 (Wed, 13 Oct 2010) New Revision: 19548 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popup.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/selectList.js Log: Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2010-10-13 09:31:42 UTC (rev 19547) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2010-10-13 10:01:15 UTC (rev 19548) @@ -55,7 +55,9 @@ @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(name = "richfaces-selection.js"), @ResourceDependency(library = "org.richfaces", name = "inplaceBase.js"), - @ResourceDependency(library = "org.richfaces", name = "select.js"), + @ResourceDependency(library = "org.richfaces", name = "popup.js"), + @ResourceDependency(library = "org.richfaces", name = "popupList.js"), + @ResourceDependency(library = "org.richfaces", name = "selectList.js"), @ResourceDependency(library = "org.richfaces", name = "inplaceInput.js"), @ResourceDependency(library = "org.richfaces", name = "inplaceSelect.js"), @ResourceDependency(library = "org.richfaces", name = "inplaceSelect.ecss") }) Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-13 09:31:42 UTC (rev 19547) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-13 10:01:15 UTC (rev 19548) @@ -4,7 +4,7 @@ rf.ui.InplaceSelect = function(id, options) { $super.constructor.call(this, id, options) - this.select = new rf.ui.Select(options.listCord, this, options); + this.select = new rf.ui.SelectList(options.listCord, this, options); this.selectItems = options.selectItems; this.selValueInput = $(document.getElementById(options.selValueInput)); this.openPopup = false; Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popup.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popup.js 2010-10-13 09:31:42 UTC (rev 19547) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popup.js 2010-10-13 10:01:15 UTC (rev 19548) @@ -4,12 +4,10 @@ rf.ui.Popup = function(id, options) { this.id = id; + this.attachToDom(id); this.popup = $(document.getElementById(id)); this.visible = options.visible; - //TODO: remove this? - this.popup.bind("blur", $.proxy(this.__onBlur, this)); - this.popup.bind("mouseover", $.proxy(this.__onMouseOver, this)); this.popup.bind("click", $.proxy(this.__onClick, this)); }; @@ -24,12 +22,12 @@ name : "popup", show: function() { - this.select.css("display", ""); + this.popup.css("display", ""); this.visible = true; }, hide: function() { - this.select.css("display", "none"); + this.popup.css("display", "none"); this.visible = false; }, @@ -45,11 +43,9 @@ }, __onClick: function(e) { - }, - - __onBlurHandler: function(e) { - } + } + } - })()); + })()); })(jQuery, window.RichFaces); \ No newline at end of file Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js 2010-10-13 09:31:42 UTC (rev 19547) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js 2010-10-13 10:01:15 UTC (rev 19548) @@ -48,9 +48,13 @@ this.items = this.popup.find("."+this.itemCss); }, - __select: function(index) { - var item; - + __select: function(item) { + var index = this.items.index(item); + this.__selectByIndex(index); + }, + + __selectByIndex: function(index) { + var item; if (this.index != -1) { item = this.items.eq(this.index); this.__unSelectItem(item); @@ -75,6 +79,7 @@ item.removeClass(this.selectItemCss); }, + //remove event, rename ??? __onEnter: function(e) { }, @@ -90,15 +95,13 @@ __onMouseOver: function(e) { var item = this.__getItem(e); - var index = this.items.index(item); - this.__select(index); + this.__select(item); }, __onClick: function(e) { var item = this.__getItem(e); - var index = this.items.index(item); - this.__select(index); this.processItem(e, item); + this.__select(item); }, __getItem: function(e) { Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/selectList.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/selectList.js 2010-10-13 09:31:42 UTC (rev 19547) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/selectList.js 2010-10-13 10:01:15 UTC (rev 19548) @@ -3,7 +3,7 @@ rf.ui = rf.ui || {}; rf.ui.SelectList = function(id, listener, options) { - $super.constructor.call(this, id, options); + $super.constructor.call(this, id, listener, options); }; rf.ui.PopupList.extend(rf.ui.SelectList);