[richfaces-svn-commits] JBoss Rich Faces SVN: r10438 - in trunk/framework/impl: src/main/javascript/prototype and 1 other directory.
Author: nbelaevski
Date: 2008-09-12 11:30:13 -0400 (Fri, 12 Sep 2008)
New Revision: 10438
Modified:
trunk/framework/impl/generatescript.xml
trunk/framework/impl/src/main/javascript/prototype/patches.js
trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js
Log:
https://jira.jboss.org/jira/browse/RF-3401
Modified: trunk/framework/impl/generatescript.xml
===================================================================
--- trunk/framework/impl/generatescript.xml 2008-09-12 14:18:18 UTC (rev 10437)
+++ trunk/framework/impl/generatescript.xml 2008-09-12 15:30:13 UTC (rev 10438)
@@ -61,7 +61,7 @@
<filelist id="prototype"
dir="${basedir}/src/main/javascript/prototype"
- files="prototype1.6.0.js,../memory.js,patches.js">
+ files="prototype-1.6.0.2.js,../memory.js,patches.js">
</filelist>
Modified: trunk/framework/impl/src/main/javascript/prototype/patches.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/patches.js 2008-09-12 14:18:18 UTC
(rev 10437)
+++ trunk/framework/impl/src/main/javascript/prototype/patches.js 2008-09-12 15:30:13 UTC
(rev 10438)
@@ -64,7 +64,7 @@
if (window.RichFaces && window.RichFaces.Memory) {
window.RichFaces.Memory.addCleaner("prototype", function(node) {
- var eventID = node._eventID;
+ var eventID = node._prototypeEventID ? node._prototypeEventID[0] : undefined;
if (eventID) {
var cache = Event.cache[eventID];
Modified: trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js 2008-09-12
14:18:18 UTC (rev 10437)
+++ trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js 2008-09-12
15:30:13 UTC (rev 10438)
@@ -386,7 +386,9 @@
var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
return (this.match(matchAll) || []).map(function(scriptTag) {
- return (scriptTag.match(matchOne) || ['', ''])[1];
+ var result = (scriptTag.match(matchOne) || ['', ''])[1];
+ result =
result.replace(/</,"<").replace(/\s*<!--[^\r\n]*/,
"");
+ return result;
});
},
@@ -4032,13 +4034,20 @@
}
} else {
- document.write("<script id=__onDOMContentLoaded defer
src=//:><\/script>");
- $("__onDOMContentLoaded").onreadystatechange = function() {
- if (this.readyState == "complete") {
- this.onreadystatechange = null;
- fireContentLoadedEvent();
- }
- };
+ // added by Pavel Yaschenko // http://jira.jboss.com/jira/browse/RF-3879
+
+ // for 1.6.0.2
+ if (document.loaded) return;
+
+ if (document.readyState != "complete") { // added by Pavel Yaschenko
+ document.write("<script id=__onDOMContentLoaded defer
src=//:><\/script>");
+ $("__onDOMContentLoaded").onreadystatechange = function() {
+ if (this.readyState == "complete") {
+ this.onreadystatechange = null;
+ fireContentLoadedEvent();
+ }
+ };
+ } // added by Pavel Yaschenko
}
})();
/*------------------------------- DEPRECATED -------------------------------*/