[richfaces-svn-commits] JBoss Rich Faces SVN: r11739 - in trunk/ui: editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce and 1 other directory.
Author: pyaschenko
Date: 2008-12-12 09:58:14 -0500 (Fri, 12 Dec 2008)
New Revision: 11739
Modified:
trunk/ui/assembly/pom.xml
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
Log:
https://jira.jboss.org/jira/browse/RF-5058
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2008-12-12 14:54:12 UTC (rev 11738)
+++ trunk/ui/assembly/pom.xml 2008-12-12 14:58:14 UTC (rev 11739)
@@ -203,6 +203,13 @@
${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/common-scrollable-data-table-min.js
</include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src-min.js
+ </include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/editor-min.js
+ </include>
+
<include>**/*-min.js</include>
</includes>
<!-- files to exclude, path relative to output's directory -->
@@ -215,15 +222,10 @@
-->
<!-- rich:editor configuration -->
+
<exclude>**/tiny_mce/**</exclude>
- <exclude>**/editor-min.js</exclude>
+ <!--exclude>**/editor-min.js</exclude-->
- <!-- include>
- ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src-min.js
- </include>
- <include>
- ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/editor-min.js
- </include -->
<!-- -->
<exclude>**/scriptaculo*</exclude>
Modified:
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
===================================================================
---
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2008-12-12
14:54:12 UTC (rev 11738)
+++
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2008-12-12
14:58:14 UTC (rev 11739)
@@ -42,14 +42,20 @@
}
function getBase(n) {
- if (n.src && /tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src))
{
- if (/_(src|dev)\.js/g.test(n.src))
+
+ //RF: added by PY
+ var local_src = n.src.replace("/org/richfaces/ui.pack.js",
"scripts/tiny_mce/tiny_mce_src.js");
+ //RF: end
+
+ //RF: changed "n.src" to "local_src" by PY
+ if (local_src &&
/tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(local_src)) {
+ if (/_(src|dev)\.js/g.test(local_src))
t.suffix = '_src';
- if ((p = n.src.indexOf('?')) != -1)
- t.query = n.src.substring(p + 1);
+ if ((p = local_src.indexOf('?')) != -1)
+ t.query = local_src.substring(p + 1);
- t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
+ t.baseURL = local_src.substring(0, local_src.lastIndexOf('/'));
// If path to script is relative and a base href was found add that one infront
if (base && t.baseURL.indexOf('://') == -1)
@@ -57,6 +63,7 @@
return t.baseURL;
}
+ //RF: end
return null;
};