Author: rfelden
Date: Fri Feb 15 17:57:45 2008
New Revision: 19723
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19723&repname=
=3Djahia
Log:
- GWT issue when using a page containing more than one GWT module : javascr=
ipt conflicts may occur
(sorry Khaled, your pdisplay is out for the moment)
- Fixed a bug in hosted mode for action menu testing
- corp v3 JAR update
- topbar gwt-init removed (now in templates v3)
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/actionmenus/public/actionmenus.html
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/shared_te=
mplates/default_v3.jar
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/proc=
essing.inc
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/project.properties&rev=3D19723&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties Fri Feb 15 17=
:57:45 2008
@@ -140,7 +140,7 @@
# set this to the correct jar for your platform
#maven.jar.gwt-dev-platform=3D${google.webtoolkit.home}/gwt-dev-windows.ja=
r(to be set in your build.properties)
maven.jar.gwt-dev-platform=3D${google.webtoolkit.home}/gwt-dev-windows.jar
-google.webtoolkit.jahiaModules =3D org.jahia.ajax.gwt.layoutManager.JahiaL=
ayoutManager,org.jahia.ajax.gwt.pdisplay.Pdisplay,org.jahia.ajax.gwt.sitema=
p.SitemapManager,org.jahia.ajax.gwt.actionmenus.ActionMenuManager
+google.webtoolkit.jahiaModules =3D org.jahia.ajax.gwt.layoutManager.JahiaL=
ayoutManager,org.jahia.ajax.gwt.sitemap.SitemapManager,org.jahia.ajax.gwt.a=
ctionmenus.ActionMenuManager
# any args you want to pass to the JVM, note that XstartOnFirstThread is O=
NLY required on the Mac =
google.webtoolkit.style=3DPRETTY
google.webtoolkit.output=3D${maven.build.dir}/jahia/jsp/jahia/gwt/
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/aj=
ax/gwt/actionmenus/public/actionmenus.html
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt/actionmenus/public/actio=
nmenus.html&rev=3D19723&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/actionmenus/public/actionmenus.html (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/actionmenus/public/actionmenus.html Fri Feb 15 17:57:45 2008
@@ -6,7 +6,7 @@
var jahiaGWTParameters =3D {
pid: "9",
op: "edit",
- serviceEntryPoint: "/org.jahia.ajax.gwt.actionmenus.ActionMenu=
Manager/"
+ serviceEntryPoint: "/org.jahia.ajax.gwt.actionmenus.ActionMenu=
Manager/",
currentUser:"root",
copyright:"nada"
};
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/sha=
red_templates/default_v3.jar
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/var/shared_templates/default_v3.jar&re=
v=3D19723&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
Binary files - no diff available.
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topba=
r/processing.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/processing.inc&rev=3D19723&re=
pname=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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/proc=
essing.inc (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/proc=
essing.inc Fri Feb 15 17:57:45 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
-<ajax:gwt-init/>
<ajax:gwt-import module=3D"org.jahia.ajax.gwt.pdisplay.Pdisplay"/>
<ajax:p-display state=3D"min" wwidth=3D"800" wheight=3D"600"/>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list