[richfaces-svn-commits] JBoss Rich Faces SVN: r9204 - in trunk/ui/modal-panel/src/main: resources/org/richfaces/renderkit/html/css and 2 other directories.

Author: nbelaevski Date: 2008-06-24 19:05:33 -0400 (Tue, 24 Jun 2008) New Revision: 9204 Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 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/modalPanelBorders.js trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx Log: http://jira.jboss.com/jira/browse/RF-2288 Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java =================================================================== --- trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2008-06-24 21:13:42 UTC (rev 9203) +++ trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2008-06-24 23:05:33 UTC (rev 9204) @@ -51,10 +51,10 @@ private static final String STATE_OPTION_SUFFIX = "StateOption_"; - protected String[] RESIZERS = new String[] { - "NWU", "N", "NEU", "NEL", "E", - "SEU", "SEL", "S", "SWL", - "SWU", "W", "NWL" + protected static final String[] RESIZERS = new String[] { + "N", "E", "S", "W", "NWU", "NEU", "NEL", + "SEU", "SEL", "SWL", + "SWU", "NWL" }; @SuppressWarnings("unchecked") Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss =================================================================== --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-06-24 21:13:42 UTC (rev 9203) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-06-24 23:05:33 UTC (rev 9204) @@ -16,6 +16,9 @@ height: 100%; border-style: none; background-color: #d0d0d0; + } + + .dr-mpnl-mask-div-opaque { filter: alpha(opacity=50); opacity: 0.5; } @@ -26,12 +29,12 @@ .dr-mpnl-panel { position: fixed; - margin: 0; - padding: 0; + margin: 0px; + padding: 0px; background-color: inherit; - width: 1px; - height: 1px; z-index: 9; + left: 0px; + top: 0px; } .dr-mpnl-resizer { @@ -42,7 +45,7 @@ filter: alpha(opacity=50); opacity: 0.5;*/ } - + .dr-mpnl-header { height: 20px; width: 100%; @@ -103,7 +106,7 @@ height: 100%; width: 100%; border : 1px solid; - z-index: 1; + z-index: -1; top: 4px; left: 4px; filter:alpha(opacity=10); 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 2008-06-24 21:13:42 UTC (rev 9203) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2008-06-24 23:05:33 UTC (rev 9204) @@ -105,17 +105,18 @@ this.borders = new Array(); if (this.options.resizeable) { - this.borders.push(new ModalPanel.Border(id + "ResizerNWU", this, "NW-resize", ModalPanel.Sizer.NWU)); this.borders.push(new ModalPanel.Border(id + "ResizerN", this, "N-resize", ModalPanel.Sizer.N)); + this.borders.push(new ModalPanel.Border(id + "ResizerE", this, "E-resize", ModalPanel.Sizer.E)); + this.borders.push(new ModalPanel.Border(id + "ResizerS", this, "S-resize", ModalPanel.Sizer.S)); + this.borders.push(new ModalPanel.Border(id + "ResizerW", this, "W-resize", ModalPanel.Sizer.W)); + + this.borders.push(new ModalPanel.Border(id + "ResizerNWU", this, "NW-resize", ModalPanel.Sizer.NWU)); this.borders.push(new ModalPanel.Border(id + "ResizerNEU", this, "NE-resize", ModalPanel.Sizer.NEU)); this.borders.push(new ModalPanel.Border(id + "ResizerNEL", this, "NE-resize", ModalPanel.Sizer.NEL)); - this.borders.push(new ModalPanel.Border(id + "ResizerE", this, "E-resize", ModalPanel.Sizer.E)); this.borders.push(new ModalPanel.Border(id + "ResizerSEU", this, "SE-resize", ModalPanel.Sizer.SEU)); this.borders.push(new ModalPanel.Border(id + "ResizerSEL", this, "SE-resize", ModalPanel.Sizer.SEL)); - this.borders.push(new ModalPanel.Border(id + "ResizerS", this, "S-resize", ModalPanel.Sizer.S)); this.borders.push(new ModalPanel.Border(id + "ResizerSWL", this, "SW-resize", ModalPanel.Sizer.SWL)); this.borders.push(new ModalPanel.Border(id + "ResizerSWU", this, "SW-resize", ModalPanel.Sizer.SWU)); - this.borders.push(new ModalPanel.Border(id + "ResizerW", this, "W-resize", ModalPanel.Sizer.W)); this.borders.push(new ModalPanel.Border(id + "ResizerNWL", this, "NW-resize", ModalPanel.Sizer.NWL)); } @@ -136,10 +137,8 @@ eCursorDiv.style.position = "absolute"; //that is to apply filter - eDiv.style.width = "1px"; - eDiv.style.height = "1px"; - eCursorDiv.style.width = "1px"; - eCursorDiv.style.height = "1px"; + eDiv.style.zoom = "1"; + eCursorDiv.style.zoom = "1"; var eCdiv = $(this.cdiv); eCdiv.style.position = "absolute"; @@ -159,11 +158,11 @@ }, width: function() { - return this.getContentElement().offsetWidth; + return this.getContentElement().parentNode.clientWidth; }, height: function() { - return this.getContentElement().offsetHeight; + return this.getContentElement().parentNode.clientHeight; }, getContentElement: function() { @@ -408,7 +407,7 @@ this.iframe = this.id.id + "IFrame"; new Insertion.Top(eCdiv, "<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.iframe + "\" " + - "style=\"position: absolute; width: 1px; height: 1px; background-color: white; overflow-y: hidden; z-index: 1;\">" + + "style=\"position: absolute; width: 1px; height: 1px; background-color: white; overflow-y: hidden; z-index: -1;\">" + "</iframe>"); eIframe = $(this.iframe); @@ -527,7 +526,7 @@ } } - this.setLeft(_left); + this.setLeft(Math.round(_left)); } if (options.top) { @@ -544,7 +543,7 @@ } } - this.setTop(_top); + this.setTop(Math.round(_top)); } if (this.options.autosized) { @@ -577,23 +576,21 @@ }, startDrag: function(border) { - //for (var k = 0; k < this.borders.length; k++ ) { - // this.borders[k].hide(); - //} + for (var k = 0; k < this.borders.length; k++ ) { + this.borders[k].hide(); + } Selection.disableSelection(document.body); }, endDrag: function(border) { for (var k = 0; k < this.borders.length; k++ ) { - //this.borders[k].show(); + this.borders[k].show(); this.borders[k].doPosition(); } Selection.enableSelection(document.body); }, hide: function(event, opts) { - - if (this.invokeEvent("beforehide",event,null,element)) { this.restoreFocus(); @@ -749,9 +746,10 @@ } } - Element.setStyle(eCdiv, cssHash); - Element.setStyle(eContentElt, cssHashWH); + + Element.setStyle(eCdiv, cssHash); + this.correctShadowSizeEx(); Object.extend(this.userOptions, cssHash); @@ -778,7 +776,7 @@ if (this.header) { this.header.doPosition(); } - + return vetoes; }, Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js =================================================================== --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js 2008-06-24 21:13:42 UTC (rev 9203) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js 2008-06-24 23:05:33 UTC (rev 9204) @@ -47,7 +47,7 @@ var eCursorDiv = $(this.modalPanel.cursorDiv); eCursorDiv.style.cursor = $(this.id).style.cursor; - eCursorDiv.style.zIndex = 8; + eCursorDiv.style.zIndex = 10; this.modalPanel.startDrag(this); Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-06-24 21:13:42 UTC (rev 9203) +++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-06-24 23:05:33 UTC (rev 9204) @@ -39,7 +39,7 @@ class="rich-modalpanel #{component.attributes['styleClass']}" x:passThruWithExclusions="id,style,class,styleClass" - <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}Div" + <div class="dr-mpnl-mask-div dr-mpnl-mask-div-opaque rich-mpnl-mask-div" id="#{clientId}Div" style="z-index: 1;" onclick="#{component.attributes['onmaskclick']}" ondblclick="#{component.attributes['onmaskdblclick']}" @@ -53,31 +53,8 @@ <button class="dr-mpnl-pnl-button" id="#{clientId}FirstHref"></button> </div> - <div id="#{clientId}CDiv" class="dr-mpnl-panel rich-mpnl_panel" > - - <jsp:scriptlet> - <![CDATA[ - if (component.isResizeable()) { - for (int i = 0; i < RESIZERS.length; i++) { - variables.setVariable("resizer", RESIZERS[i]); - - boolean isHor = i / 3 % 2 == 0; - String style = isHor ? "width: 40px; height: 4px;" : "height: 40px; width: 4px;"; - - //higher z-index for corner elements - style += "z-index: " + (i % 3 == 1 ? 0 : 1) + 3 + ";"; - variables.setVariable("resizerStyle", style); - ]]> - </jsp:scriptlet> - <div id="#{clientId}Resizer#{resizer}" class="dr-mpnl-resizer rich-mpnl-resizer" style="#{resizerStyle}"> - </div> - <jsp:scriptlet> - <![CDATA[ - } - } - ]]> - </jsp:scriptlet> - + <div class="dr-mpnl-panel rich-mpnl_panel" > + <div id="#{clientId}CDiv" style="position: absolute; left: 0px; top: 0px; z-index: 9; text-align: left;"> <div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow" style="#{component.shadowStyle}" > </div> @@ -114,7 +91,7 @@ ]]> </jsp:scriptlet> - <div id="#{clientId}ContentDiv" style="#{divStyle} position: absolute; z-index: 2; #{component.attributes['style']}" class="dr-mpnl-pnl rich-mp-content"> + <div id="#{clientId}ContentDiv" style="#{divStyle} #{component.attributes['style']}" class="dr-mpnl-pnl rich-mp-content"> <jsp:scriptlet> <![CDATA[if(component.getFacet("controls")!=null && component.getFacet("controls").isRendered()) {]]> </jsp:scriptlet> @@ -148,11 +125,36 @@ </td> </tr> </table> + + <jsp:scriptlet> + <![CDATA[ + if (component.isResizeable()) { + for (int i = 0; i < RESIZERS.length; i++) { + variables.setVariable("resizer", RESIZERS[i]); + + boolean isHor = i % 2 == 0; + String style = isHor ? "width: 40px; height: 4px;" : "height: 40px; width: 4px;"; + + //higher z-index for corner elements + //style += "z-index: " + (i % 3 == 1 ? 0 : 1) + 3 + ";"; + variables.setVariable("resizerStyle", style); + ]]> + </jsp:scriptlet> + <div id="#{clientId}Resizer#{resizer}" class="dr-mpnl-resizer rich-mpnl-resizer" style="#{resizerStyle}"> + </div> + <jsp:scriptlet> + <![CDATA[ + } + } + ]]> + </jsp:scriptlet> + + </div> </div> - + </div> <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}CursorDiv" - style="filter: alpha(opacity=1); z-index: -200"> + style="z-index: -200; background-color: transparent;"> <button class="dr-mpnl-pnl-button" id="#{clientId}LastHref"></button> </div>