You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2008/03/17 20:10:46 UTC
svn commit: r638029 - in /myfaces/trinidad/trunk_1.2.x: src/site/xdoc/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/
tr...
Author: gpetracek
Date: Mon Mar 17 12:10:44 2008
New Revision: 638029
URL: http://svn.apache.org/viewvc?rev=638029&view=rev
Log:
TRINIDAD-909
Modified:
myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DialogStyleScriptlet.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PanelPopup.js
Modified: myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml?rev=638029&r1=638028&r2=638029&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml Mon Mar 17 12:10:44 2008
@@ -4066,6 +4066,12 @@
<td>Styles the clickable icon that closes the dialog. Note - this selector must use an image, it cannot
be styled with content text.</td>
</tr>
+ <tr>
+ <td>af|dialog::blocked-area</td>
+ <td>Styles the blocked area (behind the opened modal dialog).
+ Note - at the moment the usage of !important is required to overwrite the following inline styles:
+ background-color, display, position, z-index, top, left, cursor</td>
+ </tr>
</table>
</subsection>
</section>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?rev=638029&r1=638028&r2=638029&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Mon Mar 17 12:10:44 2008
@@ -239,6 +239,8 @@
AF_DIALOG_ROOT_STYLE_CLASS + "::title-text";
public static final String AF_DIALOG_CLOSE_ICON_STYLE_CLASS =
AF_DIALOG_ROOT_STYLE_CLASS + "::close-icon";
+ public static final String AF_DIALOG_BLOCKED_AREA_STYLE_CLASS =
+ AF_DIALOG_ROOT_STYLE_CLASS + "::blocked-area";
// //
// //
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DialogStyleScriptlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DialogStyleScriptlet.java?rev=638029&r1=638028&r2=638029&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DialogStyleScriptlet.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DialogStyleScriptlet.java Mon Mar 17 12:10:44 2008
@@ -79,6 +79,8 @@
writer.writeText(arc.getStyleClass(SkinSelectors.AF_DIALOG_TITLE_STYLE_CLASS), null);
writer.writeText("','" + SkinSelectors.AF_DIALOG_CLOSE_ICON_STYLE_CLASS + "':'", null);
writer.writeText(arc.getStyleClass(SkinSelectors.AF_DIALOG_CLOSE_ICON_STYLE_CLASS), null);
+ writer.writeText("','" + SkinSelectors.AF_DIALOG_BLOCKED_AREA_STYLE_CLASS + "':'", null);
+ writer.writeText(arc.getStyleClass(SkinSelectors.AF_DIALOG_BLOCKED_AREA_STYLE_CLASS), null);
writer.writeText("'} ); ", null);
}
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PanelPopup.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PanelPopup.js?rev=638029&r1=638028&r2=638029&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PanelPopup.js (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PanelPopup.js Mon Mar 17 12:10:44 2008
@@ -347,6 +347,14 @@
//create mask for modal popups
TrPanelPopup._mask = document.createElement('div');
TrPanelPopup._mask.name = "TrPanelPopup._BlockingModalDiv";
+
+ //optional: id of blocked area
+ TrPanelPopup._mask.id = "af_dialog_blocked-area";
+
+ //set style class for blocked area
+ var page = TrPage.getInstance();
+ TrPanelPopup._mask.className = page.getStyleClass("af|dialog::blocked-area");
+
var cssText = "display:none;position: absolute; z-index: 5000;top: 0px;left: 0px;cursor: not-allowed;";
if (_agent.isIE && _agent.version == 7)
//workaround for bug in IE7 : see http://blog.thinkature.com/index.php/2006/12/29/odd-mouse-handling-with-transparent-objects-under-internet-explorer-7/
@@ -356,23 +364,31 @@
TrPanelPopup._mask.style.cssText = cssText;
TrPanelPopup._mask.innerHTML = " ";
- //consume all events
- _addEvent(TrPanelPopup._mask, "click", TrPanelPopup._consumeMaskEvent);
-
- //handle window resize events
- _addEvent(window, "resize", TrPanelPopup._setMaskSize);
-
- //set initial mask size
- TrPanelPopup._setMaskSize();
-
//add mask to body
document.body.appendChild(TrPanelPopup._mask);
}
+ TrPanelPopup._registerMaskEvents();
+
+ //set initial mask size
+ TrPanelPopup._setMaskSize();
+
TrPanelPopup._mask.style.display = "block";
}
+TrPanelPopup._registerMaskEvents = function()
+{
+ //consume all events
+ _addEvent(TrPanelPopup._mask, "click", TrPanelPopup._consumeMaskEvent);
+
+ //handle window resize events
+ _addEvent(window, "resize", TrPanelPopup._setMaskSize);
+
+ //handle window scroll events
+ _addEvent(window, "scroll", TrPanelPopup._setMaskSize);
+}
+
/**
* Hide the popup mask that blocks clicks in modal mode.
**/
@@ -380,6 +396,7 @@
{
_removeEvent(TrPanelPopup._mask, "click", TrPanelPopup._consumeMaskEvent);
_removeEvent(window, "resize", TrPanelPopup._setMaskSize);
+ _removeEvent(window, "scroll", TrPanelPopup._setMaskSize);
TrPanelPopup._mask.style.display = "none";
}
@@ -802,4 +819,5 @@
}
}
}
+