[richfaces-svn-commits] JBoss Rich Faces SVN: r10750 - in trunk/sandbox: ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directories.
Author: pyaschenko
Date: 2008-10-14 11:17:13 -0400 (Tue, 14 Oct 2008)
New Revision: 10750
Modified:
trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
Log:
editor resource loading updates
Modified: trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml 2008-10-14
15:08:28 UTC (rev 10749)
+++ trunk/sandbox/samples/editor-sample/src/main/webapp/WEB-INF/web.xml 2008-10-14
15:17:13 UTC (rev 10750)
@@ -40,7 +40,7 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
- <servlet>
+ <!--servlet>
<display-name>TinyMCE Loader Servlet</display-name>
<servlet-name>TinyMCELoaderServlet</servlet-name>
<servlet-class>org.richfaces.component.TinyMceLoaderServlet</servlet-class>
@@ -48,7 +48,7 @@
<servlet-mapping>
<servlet-name>TinyMCELoaderServlet</servlet-name>
<url-pattern>/a4j/g/3_3_0-SNAPSHOTorg/richfaces/renderkit/html/scripts/tiny_mce/*</url-pattern>
- </servlet-mapping>
+ </servlet-mapping--!>
<login-config>
<auth-method>BASIC</auth-method>
</login-config>
Modified:
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js
===================================================================
---
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-14
15:08:28 UTC (rev 10749)
+++
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-14
15:17:13 UTC (rev 10750)
@@ -1,10 +1,11 @@
-if (!Richfaces) Richfaces = {};
+if (!window.Richfaces) window.Richfaces = {};
Richfaces.Editor = {};
-Richfaces.Editor.getResourceURL = function (baseURL, type) {
+Richfaces.Editor.preInit = {extSuffix:".jsf"};
+/*Richfaces.Editor.getResourceURL = function (baseURL, type) {
return Richfaces.Editor.ResourceHTML.replace("$1", baseURL);
-};
+};*/
-Richfaces.Editor.ResourceHTML = "ghdfgsdfgsdfgsdfgdf sg sdfg$1fgsdfdfgdfg";
+//Richfaces.Editor.ResourceHTML = "ghdfgsdfgsdfgsdfgdf sg sdfg$1fgsdfdfgdfg";
RichEditor = Class.create();
Object.extend(RichEditor.prototype, {
Modified:
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
===================================================================
---
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2008-10-14
15:08:28 UTC (rev 10749)
+++
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2008-10-14
15:17:13 UTC (rev 10750)
@@ -18,6 +18,10 @@
t.isGecko = !t.isWebKit && /Gecko/.test(ua);
t.isMac = ua.indexOf('Mac') != -1;
+ if (Richfaces.Editor && Richfaces.Editor.preInit)
+ {
+ t.extSuffix = Richfaces.Editor.preInit.extSuffix;
+ }
// TinyMCE .NET webcontrol might be setting the values for TinyMCE
if (w.tinyMCEPreInit) {
t.suffix = tinyMCEPreInit.suffix;
@@ -407,7 +411,8 @@
_addVer : function(u) {
var v;
-
+
+ if (this.extSuffix) u += this.extSuffix;
if (!this.query)
return u;