[richfaces-svn-commits] JBoss Rich Faces SVN: r4797 - in trunk: samples/dragDropDemo/src/main/webapp/pages and 4 other directories.

Author: sergeyhalipov Date: 2007-12-12 15:21:13 -0500 (Wed, 12 Dec 2007) New Revision: 4797 Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx Log: http://jira.jboss.com/jira/browse/RF-1082 Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js =================================================================== --- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js 2007-12-12 19:01:09 UTC (rev 4796) +++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js 2007-12-12 20:21:13 UTC (rev 4797) @@ -34,3 +34,23 @@ if (index == -1) return; return parseFloat(userAgent.substring(index+6)); } + +RichFaces.getIEVersion = function () { + var searchString = "msie"; + var agent = navigator.userAgent.toLowerCase(); + var idx = agent.indexOf(searchString); + if (idx != -1) { + var versIdx = agent.indexOf(";", idx); + var versString; + + if (versIdx != -1) { + versString = agent.substring(idx + searchString.length, versIdx); + } else { + versString = agent.substring(idx + searchString.length); + } + + return parseFloat(versString); + } else { + return undefined; + } +} Modified: trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-12-12 19:01:09 UTC (rev 4796) +++ trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-12-12 20:21:13 UTC (rev 4797) @@ -142,7 +142,14 @@ <dnd:dropSupport acceptedTypes="file, folder"> <dnd:dndParam name="testDrop" value="testDropValue" /> - </dnd:dropSupport> + </dnd:dropSupport> + <h:selectOneMenu> + <f:selectItem itemValue="test1" itemLabel="TEST1"/> + <f:selectItem itemValue="test2" itemLabel="TEST2"/> + <f:selectItem itemValue="test3" itemLabel="TEST3"/> + <f:selectItem itemValue="test4" itemLabel="TEST4"/> + <f:selectItem itemValue="test5" itemLabel="TEST5"/> + </h:selectOneMenu> </h:panelGrid> <h:panelGrid id="grid5"> @@ -204,7 +211,15 @@ <h:outputText /> - </h:panelGrid> + </h:panelGrid> + + <h:selectOneMenu> + <f:selectItem itemValue="test1" itemLabel="TEST1"/> + <f:selectItem itemValue="test2" itemLabel="TEST2"/> + <f:selectItem itemValue="test3" itemLabel="TEST3"/> + <f:selectItem itemValue="test4" itemLabel="TEST4"/> + <f:selectItem itemValue="test5" itemLabel="TEST5"/> + </h:selectOneMenu> <h:panelGrid id="renderedId"> <dnd:dragSupport dragType="file" dragIndicator="defaultIndicator"> Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss =================================================================== --- trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss 2007-12-12 19:01:09 UTC (rev 4796) +++ trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss 2007-12-12 20:21:13 UTC (rev 4797) @@ -47,6 +47,14 @@ vertical-align : top; } +.rich-dragindicator-iframe { + position: absolute; + display: none; + z-index: 1; + top: 0px; + left: 0px; +} + ]]></f:verbatim> <f:verbatim><![CDATA[ Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js =================================================================== --- trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-12-12 19:01:09 UTC (rev 4796) +++ trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-12-12 20:21:13 UTC (rev 4797) @@ -1,6 +1,10 @@ DragIndicator = { init: function(event) { + var ieVersion = RichFaces.getIEVersion(); + if (ieVersion && ieVersion < 7) { + DragIndicator.disableSelects = true; + } }, setContent: function(name, single, params) { @@ -33,6 +37,10 @@ } new Insertion.Top(this, parts.invoke('getContent', p).join('')); + + if (DragIndicator.disableSelects) { + this.initIFrame(); + } }, show: function() { @@ -103,11 +111,22 @@ getRejectClass: function() { return this.ils_rejectClass; + }, + + initIFrame: function() { + var iframe = this.firstChild; + if (iframe && "iframe" == iframe.tagName.toLowerCase()) { + iframe.style.display = "block"; + var table = iframe.nextSibling; + iframe.style.width = table.offsetWidth + "px"; + iframe.style.height = table.offsetHeight + "px"; + } } }; function createDragIndicator(elt, acceptClass, rejectClass) { Object.extend(elt, DragIndicator); + elt.init(); elt.ils_acceptClass = acceptClass; elt.ils_rejectClass = rejectClass; @@ -128,9 +147,14 @@ // <div class="drgind_shadow" /> DefaultDragIndicatorView = [ + new E('iframe', + { + 'className':'rich-dragindicator-iframe' + } + ), new E('table', { - 'style':'height : 100%', + 'style':'height : 100%; z-index: 2;', 'className':'drgind_internal', 'cellspacing':'0', 'cellpadding':'3', Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-12-12 19:01:09 UTC (rev 4796) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-12-12 20:21:13 UTC (rev 4797) @@ -61,22 +61,9 @@ ModalPanel = Class.create(); { - var searchString = "MSIE"; - var agent = navigator.userAgent; - var idx = agent.indexOf(searchString); - if (idx != -1) { - var versIdx = agent.indexOf(";", idx); - var versString; - - if (versIdx != -1) { - versString = agent.substring(idx + searchString.length, versIdx); - } else { - versString = agent.substring(idx + searchString.length); - } - - if (parseFloat(versString) < 7) { - ModalPanel.disableSelects = true; - } + var ieVersion = RichFaces.getIEVersion(); + if (ieVersion && ieVersion < 7) { + ModalPanel.disableSelects = true; } } Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-12-12 19:01:09 UTC (rev 4796) +++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-12-12 20:21:13 UTC (rev 4797) @@ -17,10 +17,10 @@ </h:styles> <h:scripts> new org.ajax4jsf.javascript.PrototypeScript(), - /org/richfaces/renderkit/html/scripts/utils.js, + /org/richfaces/renderkit/html/scripts/utils.js, + /org/richfaces/renderkit/html/scripts/browser_info.js, /org/richfaces/renderkit/html/scripts/modalPanel.js, - /org/richfaces/renderkit/html/scripts/modalPanelBorders.js, - /org/richfaces/renderkit/html/scripts/browser_info.js + /org/richfaces/renderkit/html/scripts/modalPanelBorders.js </h:scripts> <f:clientid var="clientId"/>