Author: sshyrkov
Date: Thu Nov 29 14:07:41 2007
New Revision: 19319
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19319&repname=
=3Djahia
Log:
Get rid of the saveContent function wrapping and do not use anonymous funct=
ion
Modified:
trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp
trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp
trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp
trunk/core/src/webapp/jsp/jahia/javascript/engines.js
trunk/core/src/webapp/jsp/jahia/javascript/workinprogress.js
trunk/core/src/webapp/views/engines/common/javascripts.jsp
trunk/core/src/webapp/views/engines/engines_default_layout.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/application_field.jsp&rev=3D19319&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp Th=
u Nov 29 14:07:41 2007
@@ -471,6 +471,7 @@
=
function saveContent() {
check();
+ if (workInProgressOverlay) workInProgressOverlay.launch();
}
//-->
</script>
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/bigtext_field.jsp&rev=3D19319&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp (origi=
nal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp Thu No=
v 29 14:07:41 2007
@@ -155,6 +155,7 @@
function saveContent() {
// alert("saveContent Started");
getHtmlEditorText(document.mainForm.elements["_<%=3DtheField.getID=
()%>"]);
+ if (workInProgressOverlay) workInProgressOverlay.launch();
}
=
function changeHtmlEditor(what) {
Modified: trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/workflow/changeworkflow.jsp&rev=3D19319&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp Thu=
Nov 29 14:07:41 2007
@@ -360,6 +360,7 @@
=
function saveContent() {
check();
+ if (workInProgressOverlay) workInProgressOverlay.launch();
}
// -->
</script>
Modified: trunk/core/src/webapp/jsp/jahia/javascript/engines.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/engines.js&rev=3D19319&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/javascript/engines.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/engines.js Thu Nov 29 14:07:=
41 2007
@@ -11,6 +11,7 @@
function saveContent() {
// used by Html editors
// override this for preprocessing before for submission
+ if (workInProgressOverlay) workInProgressOverlay.launch();
}
=
var submittedCount =3D 0;
Modified: trunk/core/src/webapp/jsp/jahia/javascript/workinprogress.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/workinprogress.js&rev=3D19319&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/javascript/workinprogress.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/workinprogress.js Thu Nov 29=
14:07:41 2007
@@ -4,19 +4,13 @@
}
=
var workInProgressOverlay;
-Event.observe(window, 'load', function () {
+function initWorkInProgress() {
workInProgressOverlay =3D new WorkInProgressLoader();
- if (typeof saveContent !=3D 'undefined' && (typeof saveContent =3D=3D =
'function')) {
- var oldSaveContent =3D saveContent;
- saveContent =3D function () {
- workInProgressOverlay.launch();
- oldSaveContent();
- };
- }
if (jahia.config.startWorkInProgressOnLoad) {
workInProgressOverlay.launch();
}
-});
+} =
+Event.observe(window, 'load', initWorkInProgress);
Event.observe(window, 'unload', Event.unloadCache);
/*
Greys out the dialog window displaying 'Loading...' icon.
Modified: trunk/core/src/webapp/views/engines/common/javascripts.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/views/engines/common/javascripts.jsp&rev=3D19319&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/views/engines/common/javascripts.jsp (original)
+++ trunk/core/src/webapp/views/engines/common/javascripts.jsp Thu Nov 29 1=
4:07:41 2007
@@ -14,6 +14,7 @@
function saveContent(){
// used by Html editors
// override this for preprocessing before for submission
+ if (workInProgressOverlay) workInProgressOverlay.launch();
}
=
function teleportCaptainFlam(what) {
Modified: trunk/core/src/webapp/views/engines/engines_default_layout.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/views/engines/engines_default_layout.jsp&rev=3D19319&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/views/engines/engines_default_layout.jsp (origina=
l)
+++ trunk/core/src/webapp/views/engines/engines_default_layout.jsp Thu Nov =
29 14:07:41 2007
@@ -101,6 +101,7 @@
function saveContent() {
// used by Html editors
// override this for preprocessing before for submission
+ if (workInProgressOverlay) workInProgressOverlay.launch();
}
//-->
</script>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
