JBoss Rich Faces SVN: r11380 - trunk/ui/core/src/test/resources/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-25 14:18:55 -0500 (Tue, 25 Nov 2008)
New Revision: 11380
Modified:
trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js
Log:
Queue refactoring: event argument added to A4J.AJAX.SubmitQuery()
Modified: trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js
===================================================================
--- trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js 2008-11-25 19:18:13 UTC (rev 11379)
+++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js 2008-11-25 19:18:55 UTC (rev 11380)
@@ -195,9 +195,14 @@
var DEFAULT_REQUEST_TIME;
-A4J.AJAX.SubmitQuery = function(query, options) {
- XMLHttpRequest.requestTime = options.requestTime || XMLHttpRequest.defaultRequestTime || DEFAULT_REQUEST_TIME;
- XMLHttpRequest.data = options.data || (query._event && query._event.srcElement.id);
+A4J.AJAX.SubmitQuery = function(query, options, event) {
+ var defaultRequestTime = XMLHttpRequest.defaultRequestTime;
+ if (typeof defaultRequestTime == "function") {
+ defaultRequestTime = defaultRequestTime(event);
+ }
+
+ XMLHttpRequest.requestTime = options.requestTime || defaultRequestTime || DEFAULT_REQUEST_TIME;
+ XMLHttpRequest.data = options.data || (event && event.srcElement.id);
try {
var req = oldSubmitQuery.apply(this, arguments);
16 years, 3 months
JBoss Rich Faces SVN: r11379 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-25 14:18:13 -0500 (Tue, 25 Nov 2008)
New Revision: 11379
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
Log:
Queue refactoring: event argument added to A4J.AJAX.SubmitQuery()
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-25 19:04:46 UTC (rev 11378)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-25 19:18:13 UTC (rev 11379)
@@ -710,7 +710,7 @@
eventsQueue.submit();
};
-A4J.AJAX.PrepareQuery = function(containerId, formId, evt, options) {
+A4J.AJAX.CloneEvent = function(evt) {
var domEvt;
evt = evt || window.event || null;
if(evt){
@@ -722,7 +722,11 @@
}
LOG.debug("Have Event "+domEvt+" with properties: target: "+domEvt.target+", srcElement: "+domEvt.srcElement+", type: "+domEvt.type);
}
+
+ return domEvt;
+};
+A4J.AJAX.PrepareQuery = function(containerId, formId, domEvt, options) {
// Process listeners.
for(var li = 0; li < A4J.AJAX._listeners.length; li++){
var listener = A4J.AJAX._listeners[li];
@@ -747,7 +751,7 @@
return false;
};
};
- var tosend = new A4J.Query(containerId, form, domEvt);
+ var tosend = new A4J.Query(containerId, form);
tosend.appendFormControls(options.single, options.control);
//appending options.control moved to appendFormControls
//if(options.control){
@@ -763,13 +767,12 @@
return tosend;
};
-A4J.AJAX.SubmitQuery = function (query, options) {
+A4J.AJAX.SubmitQuery = function (query, options, domEvt) {
// build xxxHttpRequest. by Sarissa / JSHttpRequest class always defined.
var req = new A4J.AJAX.XMLHttpRequest(query);
var form = query._form;
var containerId = query._containerId;
- var domEvt = query._event;
req.options = options;
req.containerId = containerId;
@@ -815,14 +818,15 @@
//Submit or put in queue request. It not full queues - framework perform waiting only one request to same queue, new events simple replace last.
//If request for same queue already performed, replace with current parameters.
A4J.AJAX.Submit = function( containerId, formId, event , options ) {
- var query = A4J.AJAX.PrepareQuery(containerId, formId, event, options);
+ var domEvt = A4J.AJAX.CloneEvent(event);
+ var query = A4J.AJAX.PrepareQuery(containerId, formId, domEvt, options);
if (query) {
var queue = A4J.AJAX.EventQueue.getOrCreateQueue(options, formId);
if (queue) {
- queue.push(query, options, event);
+ queue.push(query, options, domEvt);
} else {
- A4J.AJAX.SubmitQuery(query, options);
+ A4J.AJAX.SubmitQuery(query, options, domEvt);
}
}
@@ -838,10 +842,11 @@
// list of updated areas in response.
// statusID - DOM id request status tags.
// oncomplete - function for call after complete request.
-A4J.AJAX.SubmitRequest = function( containerId, formId, event, options ) {
- var query = A4J.AJAX.PrepareQuery(containerId, formId, event, options);
+A4J.AJAX.SubmitRequest = function( containerId, formId, event, options ) {
+ var domEvt = A4J.AJAX.CloneEvent(event);
+ var query = A4J.AJAX.PrepareQuery(containerId, formId, domEvt, options);
if (query) {
- A4J.AJAX.SubmitQuery(query, options);
+ A4J.AJAX.SubmitQuery(query, options, domEvt);
}
return false;
@@ -1237,13 +1242,12 @@
// Class for build query string.
-A4J.Query = function(containerId, form, event){
+A4J.Query = function(containerId, form){
// For detect AJAX Request.
this._query = {AJAXREQUEST : containerId};
this._oldSubmit = null ;
this._form = form;
this._containerId = containerId;
- this._event = event;
this._actionUrl = ( this._form.action)?this._form.action:this._form;
};
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-25 19:04:46 UTC (rev 11378)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-25 19:18:13 UTC (rev 11379)
@@ -361,7 +361,7 @@
extend(EventQueueData.prototype, {
submit: function() {
this.query.appendParameter("AJAX:EVENTS_COUNT", this.eventsCount);
- this.request = A4J.AJAX.SubmitQuery(this.query, this.options)
+ this.request = A4J.AJAX.SubmitQuery(this.query, this.options, this.event);
var queue = this.queue;
this.request.queue = queue;
16 years, 3 months
JBoss Rich Faces SVN: r11378 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-11-25 14:04:46 -0500 (Tue, 25 Nov 2008)
New Revision: 11378
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java
Log:
https://jira.jboss.org/jira/browse/RF-4819
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-11-25 19:00:47 UTC (rev 11377)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-11-25 19:04:46 UTC (rev 11378)
@@ -278,4 +278,25 @@
setRichModel(false);
}
+ public void initServerMode() {
+ setSwitchType("server");
+ setToggleOnClick(false);
+ setAjaxSubmitSelection(false);
+ setRichModel(true);
+ }
+
+ public void initAjaxMode() {
+ setSwitchType("ajax");
+ setToggleOnClick(false);
+ setAjaxSubmitSelection(false);
+ setRichModel(true);
+ }
+
+ public void initClientMode() {
+ setSwitchType("client");
+ setToggleOnClick(false);
+ setAjaxSubmitSelection(false);
+ setRichModel(true);
+ }
+
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-11-25 19:00:47 UTC (rev 11377)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-11-25 19:04:46 UTC (rev 11378)
@@ -725,11 +725,12 @@
/**
* Return true if element is visible
- *
+ * @deprecated replaced by <code>isVisible(String locator)</code>.
* @param id -
* DOM element id
* @return
*/
+ @Deprecated
public boolean isVisibleById(String id) {
return selenium.isVisible("id=" + id);
}
@@ -758,6 +759,17 @@
}
/**
+ * Returns true if element with given locator is visible.
+ *
+ * @param locator
+ * an element locator
+ * @return true if element with given locator is visible, otherwise - false
+ */
+ public boolean isVisible(String locator) {
+ return selenium.isVisible(locator);
+ }
+
+ /**
* Invokes JS method on client.
*
* @param id -
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java 2008-11-25 19:00:47 UTC (rev 11377)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java 2008-11-25 19:04:46 UTC (rev 11378)
@@ -19,6 +19,9 @@
private final static String INIT_AJAX_CORE_TEST = "#{treeBean.initAjaxCoreTest}";
private final static String INIT_AJAX_CORE_TEST_WITH_SWING_MODEL = "#{treeBean.initAjaxCoreTestWithSwingModel}";
private final static String INIT_AJAX_SUBMIT_SELECTION = "#{treeBean.initAjaxSubmitSelectionTest}";
+ private final static String INIT_SERVER_MODE = "#{treeBean.initServerMode}";
+ private final static String INIT_AJAX_MODE = "#{treeBean.initAjaxMode}";
+ private final static String INIT_CLIENT_MODE = "#{treeBean.initClientMode}";
static {
params.put("parameter1", "value1");
@@ -342,6 +345,109 @@
}
}
+ @Test
+ public void testServerMode(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_SERVER_MODE);
+ tester.reset();
+ tester.clickLoad();
+ tester.startTracing();
+ writeStatus("Check server mode: a component is submitted, proper listeners are invoked");
+ writeStatus("Navigate to the first child. Node must be exposed, model - updated, listeners - invoked");
+ String compId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID);
+ selenium.click("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ waitForPageToLoad();
+ tester.checkUpdateModel(true);
+ tester.checkNodeExpandedListener(true);
+ tester.startTracing();
+ writeStatus("Navigate to the second child. Node must be exposed, model - updated, listeners - invoked");
+ selenium.click("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ waitForPageToLoad();
+ tester.checkUpdateModel(true);
+ tester.checkNodeExpandedListener(true);
+ tester.startTracing();
+ writeStatus("Set tree to invalid state and try to collapse node. Model is not updated, no listeners are invoked");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "");
+ selenium.click("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ waitForPageToLoad();
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ tester.startTracing();
+ writeStatus("The same with external validation failure");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "New");
+ tester.setExtrenalValidationFailed();
+ selenium.click("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ waitForPageToLoad();
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ }
+
+ @Test
+ public void testAjaxMode(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_AJAX_MODE);
+ tester.reset();
+ tester.clickLoad();
+ tester.startTracing();
+ writeStatus("Check ajax mode: a component is submitted, proper listeners are invoked");
+ writeStatus("Navigate to the first child. Node must be exposed, model - updated, listeners - invoked");
+ String compId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID);
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(true);
+ tester.checkNodeExpandedListener(true);
+ tester.startTracing();
+ writeStatus("Navigate to the second child. Node must be exposed, model - updated, listeners - invoked");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(true);
+ tester.checkNodeExpandedListener(true);
+ tester.startTracing();
+ writeStatus("Set tree to invalid state and try to collapse node. Model is not updated, no listeners are invoked");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ tester.startTracing();
+ writeStatus("The same with external validation failure");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "New");
+ tester.setExtrenalValidationFailed();
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ }
+
+ @Test
+ public void testClientMode(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_CLIENT_MODE);
+ tester.reset();
+ tester.clickLoad();
+ tester.startTracing();
+ writeStatus("Check client mode: all the time node is exposed, model stays untouched, no listeners are invoked");
+ writeStatus("Navigate to the first child.");
+ String compId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID);
+ selenium.click("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ writeStatus("Navigate to the second child.");
+ selenium.click("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ writeStatus("Set tree to invalid state and try to collapse node. Now all is allowed");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "");
+ selenium.click("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ Assert.assertFalse(isVisible("//*[@id='"+ compId + ":childs']/div/div"), "Node has not been collapsed");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ writeStatus("The same with external validation failure");
+ selenium.click("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "New");
+ tester.setExtrenalValidationFailed();
+ selenium.click("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ Assert.assertFalse(isVisible("//*[@id='"+ compId + ":childs']/div/div"), "Node has not been collapsed");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ }
+
@Override
public void sendAjax() {
AutoTester tester = getAutoTester(this);
16 years, 3 months
JBoss Rich Faces SVN: r11377 - trunk/samples/editor-sample/src/main/webapp/tiny-custom-plugins/myemotions/langs.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-11-25 14:00:47 -0500 (Tue, 25 Nov 2008)
New Revision: 11377
Modified:
trunk/samples/editor-sample/src/main/webapp/tiny-custom-plugins/myemotions/langs/en_dlg.js
Log:
https://jira.jboss.org/jira/browse/RF-5084
Modified: trunk/samples/editor-sample/src/main/webapp/tiny-custom-plugins/myemotions/langs/en_dlg.js
===================================================================
--- trunk/samples/editor-sample/src/main/webapp/tiny-custom-plugins/myemotions/langs/en_dlg.js 2008-11-25 18:52:11 UTC (rev 11376)
+++ trunk/samples/editor-sample/src/main/webapp/tiny-custom-plugins/myemotions/langs/en_dlg.js 2008-11-25 19:00:47 UTC (rev 11377)
@@ -1,5 +1,5 @@
tinyMCE.addI18n('en.myemotions_dlg',{
title:"Insert emotion",
desc:"Emotions",
-cool:"Cool",
+cool:"Cool"
});
\ No newline at end of file
16 years, 3 months
JBoss Rich Faces SVN: r11376 - in trunk/ui/editor/src/main: resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-11-25 13:52:11 -0500 (Tue, 25 Nov 2008)
New Revision: 11376
Modified:
trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorAdvancedThemeIcons.java
trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorSimpleThemeIcons.java
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss
Log:
https://jira.jboss.org/jira/browse/RF-5051
Modified: trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorAdvancedThemeIcons.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorAdvancedThemeIcons.java 2008-11-25 18:20:10 UTC (rev 11375)
+++ trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorAdvancedThemeIcons.java 2008-11-25 18:52:11 UTC (rev 11376)
@@ -20,6 +20,7 @@
*/
package org.richfaces.renderkit.html.images;
+import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
@@ -90,9 +91,11 @@
BufferedImage secondTriangle1 = paintSecondTriangleBlock(stored, false);
BufferedImage secondTriangle2 = paintSecondTriangleBlock(stored, true);
+ graphics.setBackground(Color.WHITE);
+ graphics.clearRect(0, 0, 88, 66);
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-
+
graphics.drawImage(block1, 0, 0, 22, 22, null);
graphics.drawImage(separator, 22, 0, 5, 22, null);
graphics.drawImage(block2, 0, 22, 22, 22, null);
Modified: trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorSimpleThemeIcons.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorSimpleThemeIcons.java 2008-11-25 18:20:10 UTC (rev 11375)
+++ trunk/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EditorSimpleThemeIcons.java 2008-11-25 18:52:11 UTC (rev 11376)
@@ -20,6 +20,7 @@
*/
package org.richfaces.renderkit.html.images;
+import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
@@ -81,6 +82,8 @@
BufferedImage block2 = paintMainBlock(stored, true, false);
BufferedImage block3 = paintMainBlock(stored, true, true);
+ graphics.setBackground(Color.WHITE);
+ graphics.clearRect(0, 0, 40, 66);
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
graphics.drawImage(block1, 0, 0, 22, 22, null);
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss 2008-11-25 18:20:10 UTC (rev 11375)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss 2008-11-25 18:52:11 UTC (rev 11376)
@@ -5,109 +5,8 @@
<f:verbatim><![CDATA[
/* Reset */
+]]></f:verbatim>
-.richfacesSkin table td {vertical-align:middle}
-
-/* Containers */
-.richfacesSkin .mceToolbar {height:26px}
-
-/* External */
-.richfacesSkin .mceExternalToolbar {position:absolute; display:none}
-.richfacesSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
-.richfacesSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; }
-
-/* Layout */
-
-
-.richfacesSkin .mceStatusbar {display:block; font-size:9pt; line-height:16px; overflow:visible; height:20px}
-.richfacesSkin .mceStatusbar div {float:left; padding:2px}
-.richfacesSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize}
-.richfacesSkin .mceStatusbar a:hover {text-decoration:underline}
-.richfacesSkin table.mceToolbar {margin-left:3px}
-.richfacesSkin .mceToolbar .mceToolbarStart span {display:block; width:1px; height:22px; margin-left:3px;}
-.richfacesSkin .mceToolbar td.mceFirst span {margin:0}
-.richfacesSkin .mceToolbar .mceToolbarEnd span {display:block; width:1px; height:22px}
-.richfacesSkin .mceToolbar .mceToolbarEndListBox span, .richfacesSkin .mceToolbar .mceToolbarStartListBox span {display:none}
-.richfacesSkin span.mceIcon, .richfacesSkin img.mceIcon {display:block; width:20px; height:20px}
-.richfacesSkin td.mceCenter {text-align:center;}
-.richfacesSkin td.mceCenter table {margin:0 auto; text-align:left;}
-.richfacesSkin td.mceRight table {margin:0 0 0 auto;}
-
-/* Button */
-.richfacesSkin .mceButton {display:block; width:22px; height:22px}
-.richfacesSkin a.mceButton span, .richfacesSkin a.mceButton img {margin-left:1px}
-.richfacesSkin .mceOldBoxModel a.mceButton span, .richfacesSkin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}
-.richfacesSkin a.mceButtonEnabled:hover {background-position:0 -22px}
-.richfacesSkin a.mceButtonActive, .richfacesSkin a.mceButtonSelected {background-position:0 -44px}
-.richfacesSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
-.richfacesSkin .mceButtonLabeled {width:auto}
-.richfacesSkin .mceButtonLabeled span.mceIcon {float:left}
-.richfacesSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px}
-
-/* Separator */
-.richfacesSkin .mceSeparator {display:block; width:5px; height:22px}
-
-/* ListBox */
-.richfacesSkin .mceListBox {margin-left:3px}
-.richfacesSkin .mceListBox, .richfacesSkin .mceListBox a {display:block}
-.richfacesSkin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; font-size:11px; height:20px; line-height:20px; overflow:hidden}
-.richfacesSkin .mceListBox .mceOpen {width:14px; height:22px; }
-.richfacesSkin table.mceListBoxEnabled:hover .mceOpen, .richfacesSkin .mceListBoxHover .mceOpen, .richfacesSkin .mceListBoxSelected .mceOpen {background-position:-66px -22px}
-.richfacesSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
-.richfacesSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
-.richfacesSkin select.mceListBox {font-size:12px;}
-
-/* SplitButton */
-.richfacesSkin .mceSplitButton, .richfacesSkin .mceSplitButton a, .richfacesSkin .mceSplitButton span {display:block; height:22px}
-.richfacesSkin .mceSplitButton a.mceAction {width:22px}
-.richfacesSkin .mceSplitButton span.mceAction {width:22px; }
-.richfacesSkin .mceSplitButton a.mceOpen {width:10px}
-.richfacesSkin .mceSplitButton span.mceOpen {width:10px; }
-.richfacesSkin table.mceSplitButtonEnabled:hover span.mceOpen, .richfacesSkin .mceSplitButtonHover span.mceOpen, .richfacesSkin .mceSplitButtonSelected span.mceOpen {background-position:-44px -44px}
-.richfacesSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; filter:alpha(opacity=30)}
-.richfacesSkin .mceSplitButtonActive {background-position:0 -44px}
-
-/* ColorSplitButton */
-
-.richfacesSkin .mceColorSplitMenu td {padding:2px}
-.richfacesSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden}
-.richfacesSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
-.richfacesSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-size:11px; line-height:20px}
-.richfacesSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; overflow:hidden}
-.richfacesSkin .mce_forecolor span.mceAction, .richfacesSkin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
-
-/* Menu */
-.richfacesSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000}
-.richfacesSkin .mceNoIcons span.mceIcon {width:0;}
-.richfacesSkin .mceNoIcons a .mceText {padding-left:10px}
-.richfacesSkin .mceMenu a, .richfacesSkin .mceMenu span, .richfacesSkin .mceMenu {display:block}
-.richfacesSkin .mceMenu td {height:20px}
-.richfacesSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
-.richfacesSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
-.richfacesSkin .mceMenu span.mceText, .richfacesSkin .mceMenu .mcePreview {font-size:11px}
-.richfacesSkin .mceMenu pre.mceText {font-family:Monospace}
-.richfacesSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
-.richfacesSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px}
-.richfacesSkin .mceMenu span.mceMenuLine {display:none}
-
-/* Progress,Resize */
-.richfacesSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50)}
-.richfacesSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; width:32px; height:32px; margin:-16px 0 0 -16px}
-
-/* Formats */
-.richfacesSkin .mce_formatPreview a {font-size:10px}
-.richfacesSkin .mce_p span.mceText {}
-.richfacesSkin .mce_address span.mceText {font-style:italic}
-.richfacesSkin .mce_pre span.mceText {font-family:monospace}
-.richfacesSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
-.richfacesSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
-.richfacesSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
-.richfacesSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
-.richfacesSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
-.richfacesSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
-]]>
-</f:verbatim>
-
<u:selector name=".richfacesSkin table, .richfacesSkin tbody, .richfacesSkin a, .richfacesSkin img, .richfacesSkin tr, .richfacesSkin div, .richfacesSkin td, .richfacesSkin iframe, .richfacesSkin span, .richfacesSkin *, .richfacesSkin .mceText">
<u:style name="color" skin="generalTextColor"/>
<u:style name="border" value="0"/>
@@ -131,6 +30,12 @@
<u:style name="cursor" value="default"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin table td {vertical-align:middle}
+
+/* Containers */
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin table">
<u:style name="background" skin="additionalBackgroundColor"/>
</u:selector>
@@ -140,13 +45,26 @@
<u:style name="background" skin="tableBackgroundColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceToolbar {height:26px}
+
+/* External */
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceExternalToolbar">
<u:style name="border-width" value="1px"/>
<u:style name="border-style" value="solid"/>
<u:style name="border-color" skin="panelBorderColor"/>
<u:style name="border-bottom" value="0"/>
+ <u:style name="position" value="absolute"/>
+ <u:style name="display" value="none"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
+.richfacesSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; }
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceExternalClose">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/icons.gif"/>
@@ -154,6 +72,10 @@
<u:style name="background-position" value="-820px 0"/>
</u:selector>
+<f:verbatim><![CDATA[
+/* Layout */
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin table.mceLayout">
<u:style name="border" value="0"/>
<u:style name="border-left-width" value="1px"/>
@@ -191,11 +113,20 @@
<u:style name="border-bottom-color" skin="panelBorderColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceStatusbar {display:block; font-size:9pt; line-height:16px; overflow:visible; height:20px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceStatusbar">
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="color" skin="generalTextColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceStatusbar div {float:left; padding:2px}
+.richfacesSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceStatusbar a.mceResize">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/icons.gif"/>
@@ -203,6 +134,12 @@
<u:style name="background-position" value="-800px 0"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceStatusbar a:hover {text-decoration:underline}
+.richfacesSkin table.mceToolbar {margin-left:3px}
+.richfacesSkin .mceToolbar .mceToolbarStart span {display:block; width:1px; height:22px; margin-left:3px;}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceToolbar .mceToolbarStart span">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.EditorAdvancedThemeIcons"/>
@@ -210,6 +147,11 @@
<u:style name="background-position" value="-22px 0"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceToolbar td.mceFirst span {margin:0}
+.richfacesSkin .mceToolbar .mceToolbarEnd span {display:block; width:1px; height:22px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceToolbar .mceToolbarEnd span">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.EditorAdvancedThemeIcons"/>
@@ -217,6 +159,11 @@
<u:style name="background-position" value="-22px 0"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceToolbar .mceToolbarEndListBox span, .richfacesSkin .mceToolbar .mceToolbarStartListBox span {display:none}
+.richfacesSkin span.mceIcon, .richfacesSkin img.mceIcon {display:block; width:20px; height:20px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceIcon">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/icons.gif"/>
@@ -225,12 +172,39 @@
<u:style name="background-position" value="20px 20px"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin td.mceCenter {text-align:center;}
+.richfacesSkin td.mceCenter table {margin:0 auto; text-align:left;}
+.richfacesSkin td.mceRight table {margin:0 0 0 auto;}
+
+/* Button */
+.richfacesSkin .mceButton {display:block; width:22px; height:22px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceButton">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.EditorAdvancedThemeIcons"/>
</u:style>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin a.mceButton span, .richfacesSkin a.mceButton img {margin-left:1px}
+.richfacesSkin .mceOldBoxModel a.mceButton span, .richfacesSkin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}
+.richfacesSkin a.mceButtonEnabled:hover {background-position:0 -22px}
+]]></f:verbatim>
+
+<u:selector name=".richfacesSkin a.mceButtonEnabled:hover">
+ <u:style name="background-color" skin="headerBackgroundColor"/>
+</u:selector>
+
+<f:verbatim><![CDATA[
+.richfacesSkin a.mceButtonActive, .richfacesSkin a.mceButtonSelected {background-position:0 -44px}
+.richfacesSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
+.richfacesSkin .mceButtonLabeled {width:auto}
+.richfacesSkin .mceButtonLabeled span.mceIcon {float:left}
+.richfacesSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin span.mceButtonLabel">
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
@@ -239,6 +213,11 @@
<u:style name="color" value="#FF0000"/>
</u:selector>
+<f:verbatim><![CDATA[
+/* Separator */
+.richfacesSkin .mceSeparator {display:block; width:5px; height:22px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceSeparator">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.EditorAdvancedThemeIcons"/>
@@ -246,6 +225,13 @@
<u:style name="background-position" value="-22px 0"/>
</u:selector>
+<f:verbatim><![CDATA[
+/* ListBox */
+.richfacesSkin .mceListBox {margin-left:3px}
+.richfacesSkin .mceListBox, .richfacesSkin .mceListBox a {display:block}
+.richfacesSkin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; font-size:11px; height:20px; line-height:20px; overflow:hidden}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceListBox .mceText">
<u:style name="background" skin="tableBackgroundColor"/>
<u:style name="border-width" value="1px"/>
@@ -255,6 +241,10 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceListBox .mceOpen {width:14px; height:22px; }
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceListBox .mceOpen">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.EditorAdvancedThemeIcons"/>
@@ -266,24 +256,44 @@
<u:style name="background" skin="tableBackgroundColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin table.mceListBoxEnabled:hover .mceOpen, .richfacesSkin .mceListBoxHover .mceOpen, .richfacesSkin .mceListBoxSelected .mceOpen {background-position:-66px -22px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceListBoxDisabled .mceText">
<u:style name="color" value="gray"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
+.richfacesSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin select.mceListBox">
<u:style name="background" skin="tableBackgroundColor"/>
<u:style name="border-width" value="1px"/>
<u:style name="border-style" value="solid"/>
<u:style name="border-color" skin="panelBorderColor"/>
<u:style name="font-family" skin="generalFamilyFont"/>
+ <u:style name="font-size" value="12px"/>
</u:selector>
+<f:verbatim><![CDATA[
+/* SplitButton */
+.richfacesSkin .mceSplitButton, .richfacesSkin .mceSplitButton a, .richfacesSkin .mceSplitButton span {display:block; height:22px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceSplitButton">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.EditorAdvancedThemeIcons"/>
</u:style>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceSplitButton a.mceAction {width:22px}
+.richfacesSkin .mceSplitButton span.mceAction {width:22px; }
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceSplitButton span.mceAction">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/img/icons.gif"/>
@@ -291,6 +301,11 @@
<u:style name="background-position" value="20px 20px"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceSplitButton a.mceOpen {width:10px}
+.richfacesSkin .mceSplitButton span.mceOpen {width:10px; }
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceSplitButton span.mceOpen">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.EditorAdvancedThemeIcons"/>
@@ -305,6 +320,14 @@
<u:style name="background-position" value="0 -22px"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin table.mceSplitButtonEnabled:hover span.mceOpen, .richfacesSkin .mceSplitButtonHover span.mceOpen, .richfacesSkin .mceSplitButtonSelected span.mceOpen {background-position:-44px -44px}
+.richfacesSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; filter:alpha(opacity=30)}
+.richfacesSkin .mceSplitButtonActive {background-position:0 -44px}
+
+/* ColorSplitButton */
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin div.mceColorSplitMenu table">
<u:style name="background" skin="tableBackgroundColor"/>
<u:style name="border-width" value="1px"/>
@@ -312,12 +335,22 @@
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceColorSplitMenu td {padding:2px}
+.richfacesSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceColorSplitMenu a">
<u:style name="border-width" value="1px"/>
<u:style name="border-style" value="solid"/>
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
+.richfacesSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-size:11px; line-height:20px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceColorSplitMenu a.mceMoreColors">
<u:style name="border-width" value="1px"/>
<u:style name="border-style" value="solid"/>
@@ -338,25 +371,54 @@
<u:style name="border-color" skin="headerBackgroundColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; overflow:hidden}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceColorPreview">
<u:style name="background" skin="tableBorderColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mce_forecolor span.mceAction, .richfacesSkin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
+
+/* Menu */
+.richfacesSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceMenu">
<u:style name="border-width" value="1px"/>
<u:style name="border-style" value="solid"/>
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceNoIcons span.mceIcon {width:0;}
+.richfacesSkin .mceNoIcons a .mceText {padding-left:10px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceMenu table">
<u:style name="background" skin="tableBackgroundColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceMenu a, .richfacesSkin .mceMenu span, .richfacesSkin .mceMenu {display:block}
+.richfacesSkin .mceMenu td {height:20px}
+.richfacesSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
+.richfacesSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceMenu .mceText">
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="color" skin="generalTextColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceMenu span.mceText, .richfacesSkin .mceMenu .mcePreview {font-size:11px}
+.richfacesSkin .mceMenu pre.mceText {font-family:Monospace}
+.richfacesSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceMenu .mceMenuItemEnabled a:hover, .richfacesSkin .mceMenu .mceMenuItemActive">
<u:style name="background-color" skin="additionalBackgroundColor"/>
</u:selector>
@@ -376,6 +438,8 @@
<u:selector name=".richfacesSkin .mceMenuItemTitle span.mceText">
<u:style name="color" skin="generalTextColor"/>
+ <u:style name="font-weight" value="bold"/>
+ <u:style name="padding-left" value="4px"/>
</u:selector>
<u:selector name=".richfacesSkin .mceMenuItemDisabled .mceText">
@@ -396,6 +460,10 @@
<u:style name="background-position" value="-6px center"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceMenu span.mceMenuLine {display:none}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceMenuItemSub a">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif"/>
@@ -404,10 +472,19 @@
<u:style name="background-position" value="top right"/>
</u:selector>
+<f:verbatim><![CDATA[
+/* Progress,Resize */
+.richfacesSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50)}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceBlocker">
<u:style name="background" skin="tableBackgroundColor"/>
</u:selector>
+<f:verbatim><![CDATA[
+.richfacesSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; width:32px; height:32px; margin:-16px 0 0 -16px}
+]]></f:verbatim>
+
<u:selector name=".richfacesSkin .mceProgress">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/img/progress.gif"/>
@@ -421,11 +498,19 @@
<u:style name="border-color" skin="tableBorderColor"/>
</u:selector>
-<u:selector name=".richfacesSkin a.mceButtonEnabled:hover">
- <u:style name="background-color" skin="headerBackgroundColor"/>
-</u:selector>
+<f:verbatim><![CDATA[
+/* Formats */
+.richfacesSkin .mce_formatPreview a {font-size:10px}
+.richfacesSkin .mce_p span.mceText {}
+.richfacesSkin .mce_address span.mceText {font-style:italic}
+.richfacesSkin .mce_pre span.mceText {font-family:monospace}
+.richfacesSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
+.richfacesSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
+.richfacesSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
+.richfacesSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
+.richfacesSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
+.richfacesSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
-<f:verbatim><![CDATA[
/* Theme */
.richfacesSkin span.mce_bold {background-position:0 0}
.richfacesSkin span.mce_italic {background-position:-60px 0}
16 years, 3 months
JBoss Rich Faces SVN: r11375 - in trunk/ui/core/src: main/java/org/ajax4jsf/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-25 13:20:10 -0500 (Tue, 25 Nov 2008)
New Revision: 11375
Modified:
trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java
trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java
Log:
Queue code refactored: global name constant returned back to UIQueue
Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java 2008-11-25 18:19:16 UTC (rev 11374)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java 2008-11-25 18:20:10 UTC (rev 11375)
@@ -33,6 +33,9 @@
*/
public abstract class UIQueue extends UIComponentBase {
+ //TODO move to appropriate place
+ public static final String GLOBAL_QUEUE_NAME = "org.richfaces.queue.global";
+
public static final String COMPONENT_TYPE = "org.ajax4jsf.Queue";
public static final String COMPONENT_FAMILY = "org.ajax4jsf.Queue";
@@ -104,7 +107,7 @@
}
} else {
if (name == null || name.length() == 0) {
- name = QueueRegistry.GLOBAL_QUEUE_NAME;
+ name = GLOBAL_QUEUE_NAME;
}
clientName = context.getExternalContext().encodeNamespace(name);
Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-11-25 18:19:16 UTC (rev 11374)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-11-25 18:20:10 UTC (rev 11375)
@@ -33,6 +33,7 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.component.QueueRegistry;
+import org.ajax4jsf.component.UIQueue;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.javascript.JSObject;
import org.ajax4jsf.javascript.ScriptUtils;
@@ -96,7 +97,16 @@
requestMap.put(resourceKey, Boolean.TRUE);
QueueRegistry queueRegistry = QueueRegistry.getInstance(context);
- if (queueRegistry.hasRegisteredQueues()) {
+ if (queueRegistry.isShouldCreateDefaultGlobalQueue()) {
+ String encodedGlobalQueueName = context.getExternalContext().encodeNamespace(
+ UIQueue.GLOBAL_QUEUE_NAME);
+
+ if (!queueRegistry.containsQueue(encodedGlobalQueueName)) {
+ queueRegistry.registerQueue(context, encodedGlobalQueueName, null);
+ }
+ }
+
+ if (queueRegistry.hasQueuesToEncode()) {
super.encode(resource, context, queueRegistry.getRegisteredQueues(context), attributes);
}
}
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-11-25 18:19:16 UTC (rev 11374)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-11-25 18:20:10 UTC (rev 11375)
@@ -128,7 +128,7 @@
HtmlPage page = renderView();
String queueScript = getQueueScript(page);
- assertEquals(createQueueInitString(QueueRegistry.GLOBAL_QUEUE_NAME, null, null), queueScript);
+ assertEquals(createQueueInitString(UIQueue.GLOBAL_QUEUE_NAME, null, null), queueScript);
}
public void testFormQueueName() throws Exception {
16 years, 3 months
JBoss Rich Faces SVN: r11374 - in trunk/framework/impl/src/main/java/org/ajax4jsf: context and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-25 13:19:16 -0500 (Tue, 25 Nov 2008)
New Revision: 11374
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java
trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java
Log:
Queue code refactored: global name constant returned back to UIQueue
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java 2008-11-25 18:08:10 UTC (rev 11373)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java 2008-11-25 18:19:16 UTC (rev 11374)
@@ -34,11 +34,10 @@
*/
public class QueueRegistry {
- //TODO move to appropriate place
- public static final String GLOBAL_QUEUE_NAME = "org.richfaces.queue.global";
-
private static final String REGISTRY_ATTRIBUTE_NAME = QueueRegistry.class.getName();
+ private boolean shouldCreateDefaultGlobalQueue = false;
+
private Map<String, Object> queuesData = new LinkedHashMap<String, Object>();
private QueueRegistry() {
@@ -60,25 +59,30 @@
}
public void registerQueue(FacesContext context, String clientName, Object data) {
- if (!queuesData.containsKey(clientName)) {
+ if (!containsQueue(clientName)) {
queuesData.put(clientName, data);
} else {
context.getExternalContext().log("Queue with name '" + clientName + "' has already been registered");
}
}
+ public boolean containsQueue(String name) {
+ return queuesData.containsKey(name);
+ }
+
public Map<String, Object> getRegisteredQueues(FacesContext context) {
return queuesData;
}
+
+ public void setShouldCreateDefaultGlobalQueue() {
+ this.shouldCreateDefaultGlobalQueue = true;
+ }
- public void createGlobalDefaultQueue(FacesContext context) {
- String encodedGlobalQueueName = context.getExternalContext().encodeNamespace(GLOBAL_QUEUE_NAME);
- if (!queuesData.containsKey(encodedGlobalQueueName)) {
- queuesData.put(encodedGlobalQueueName, null);
- }
+ public boolean isShouldCreateDefaultGlobalQueue() {
+ return shouldCreateDefaultGlobalQueue;
}
- public boolean hasRegisteredQueues() {
- return !queuesData.isEmpty();
+ public boolean hasQueuesToEncode() {
+ return shouldCreateDefaultGlobalQueue || !queuesData.isEmpty();
}
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2008-11-25 18:08:10 UTC (rev 11373)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2008-11-25 18:19:16 UTC (rev 11374)
@@ -457,10 +457,10 @@
QueueRegistry queueRegistry = QueueRegistry.getInstance(context);
if (Boolean.valueOf(getInitParameterValue(context, "org.richfaces.queue.global.enabled"))) {
- queueRegistry.createGlobalDefaultQueue(context);
+ queueRegistry.setShouldCreateDefaultGlobalQueue();
}
- if (queueRegistry.hasRegisteredQueues()) {
+ if (queueRegistry.hasQueuesToEncode()) {
InternetResource queueScriptResource = resourceBuilder.getResource(QUEUE_SCRIPT_RESOURCE);
queueScriptResource.encode(context, null);
}
16 years, 3 months
JBoss Rich Faces SVN: r11373 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-25 13:08:10 -0500 (Tue, 25 Nov 2008)
New Revision: 11373
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
Log:
Unit test broken by last commit fixed
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-25 17:58:24 UTC (rev 11372)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-25 18:08:10 UTC (rev 11373)
@@ -294,6 +294,14 @@
A4J.AJAX.EventQueue.getOrCreateQueue = function(){
var qualifyName = function(name, prefix) {
if (prefix) {
+ return prefix + ":" + name;
+ } else {
+ return name;
+ }
+ };
+
+ var qualifyNamespace = function(name, prefix) {
+ if (prefix) {
return prefix + name;
} else {
return name;
@@ -310,12 +318,12 @@
if (queueName) {
formQueueName = qualifyName(queueName, formId);
- viewQueueName = qualifyName(queueName, namespace);
+ viewQueueName = qualifyNamespace(queueName, namespace);
implicitQueueName = viewQueueName;
} else {
formQueueName = formId;
- viewQueueName = qualifyName(A4J.AJAX.EventQueue.DEFAULT_QUEUE_NAME, namespace);
+ viewQueueName = qualifyNamespace(A4J.AJAX.EventQueue.DEFAULT_QUEUE_NAME, namespace);
implicitQueueName = options.implicitEventsQueue;
}
16 years, 3 months
JBoss Rich Faces SVN: r11372 - trunk/ui/core/src/test/java/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-25 12:58:24 -0500 (Tue, 25 Nov 2008)
New Revision: 11372
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java
Log:
Additional test case for single-sized queue added
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java 2008-11-25 17:57:47 UTC (rev 11371)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java 2008-11-25 17:58:24 UTC (rev 11372)
@@ -218,6 +218,9 @@
ajax(500, "d", parametersBuilder.similarityGroupingId("d"));
ajax(700, "e", parametersBuilder.similarityGroupingId("e"));
+ ajax(9800, "f", parametersBuilder.similarityGroupingId("f").requestTime(1000));
+ ajax(10100, "g", parametersBuilder.similarityGroupingId("f").requestTime(1500));
+
TestsResult result = getTestsResult();
return result;
}
@@ -303,10 +306,11 @@
}
System.out.println();
- assertEquals(2, dataList.size());
+ assertEquals(3, dataList.size());
checkRequestData(dataList.get(0), "b", 300, 600, false);
checkRequestData(dataList.get(1), "e", 900, 1200, false);
+ checkRequestData(dataList.get(2), "f", 10000, 11000, false);
}
public void testDropNewSingle() throws Exception {
@@ -318,10 +322,11 @@
}
System.out.println();
- assertEquals(2, dataList.size());
+ assertEquals(3, dataList.size());
checkRequestData(dataList.get(0), "a", 100, 400, false);
checkRequestData(dataList.get(1), "d", 700, 1000, false);
+ checkRequestData(dataList.get(2), "f", 10000, 11000, false);
}
public void testFireNextSingle() throws Exception {
@@ -333,13 +338,16 @@
}
System.out.println();
- assertEquals(5, dataList.size());
+ assertEquals(7, dataList.size());
checkRequestData(dataList.get(0), "a", 100, 400, false);
checkRequestData(dataList.get(1), "b", 300, 600, false);
checkRequestData(dataList.get(2), "c", 400, 700, false);
checkRequestData(dataList.get(3), "d", 500, 800, false);
checkRequestData(dataList.get(4), "e", 900, 1200, false);
+
+ checkRequestData(dataList.get(5), "f", 10000, 11000, false);
+ checkRequestData(dataList.get(6), "g", 10100, 11600, false);
}
public void testFireNewSingle() throws Exception {
@@ -351,13 +359,16 @@
}
System.out.println();
- assertEquals(5, dataList.size());
+ assertEquals(7, dataList.size());
checkRequestData(dataList.get(0), "b", 100, 400, false);
checkRequestData(dataList.get(1), "a", 100, 400, false);
checkRequestData(dataList.get(2), "c", 400, 700, false);
checkRequestData(dataList.get(3), "e", 700, 1000, false);
checkRequestData(dataList.get(4), "d", 700, 1000, false);
+
+ checkRequestData(dataList.get(5), "f", 10000, 11000, false);
+ checkRequestData(dataList.get(6), "g", 10100, 11600, false);
}
public void testOnSizeExceeded() throws Exception {
16 years, 3 months
JBoss Rich Faces SVN: r11371 - in trunk/framework/impl/src/main: javascript/ajaxjsf and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-25 12:57:47 -0500 (Tue, 25 Nov 2008)
New Revision: 11371
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
Log:
a4j:queue and portlets: minor namespace encoding issues fixed
- ':' was appended to namespace
- similarityGroupingId not namespace-encoded
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-11-25 17:07:46 UTC (rev 11370)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-11-25 17:57:47 UTC (rev 11371)
@@ -338,7 +338,8 @@
options.put("implicitEventsQueue", clientId);
}
- String namespace = facesContext.getExternalContext().encodeNamespace("");
+ ExternalContext externalContext = facesContext.getExternalContext();
+ String namespace = externalContext.encodeNamespace("");
if (namespace != null && namespace.length() != 0) {
options.put("namespace", namespace);
}
@@ -346,7 +347,10 @@
String similarityGroupingId = (String) componentAttributes.get(SIMILARITY_GROUPING_ID_ATTR);
if (similarityGroupingId == null || similarityGroupingId.length() == 0) {
similarityGroupingId = clientId;
+ } else {
+ similarityGroupingId = externalContext.encodeNamespace(similarityGroupingId);
}
+
options.put(SIMILARITY_GROUPING_ID_ATTR, similarityGroupingId);
// request timeout.
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-25 17:07:46 UTC (rev 11370)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-25 17:57:47 UTC (rev 11371)
@@ -294,7 +294,7 @@
A4J.AJAX.EventQueue.getOrCreateQueue = function(){
var qualifyName = function(name, prefix) {
if (prefix) {
- return prefix + ':' + name;
+ return prefix + name;
} else {
return name;
}
16 years, 3 months