You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/01/12 16:55:52 UTC
svn commit: r733820 - in
/labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo:
AddDojoMethodsToHead.aj DojoWebHandler.java InstallDojoThemeJs.aj
Author: simoneg
Date: Mon Jan 12 07:55:45 2009
New Revision: 733820
URL: http://svn.apache.org/viewvc?rev=733820&view=rev
Log:
Adding custom methods for dojo
Added:
labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/AddDojoMethodsToHead.aj
Removed:
labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/InstallDojoThemeJs.aj
Modified:
labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/DojoWebHandler.java
Added: labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/AddDojoMethodsToHead.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/AddDojoMethodsToHead.aj?rev=733820&view=auto
==============================================================================
--- labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/AddDojoMethodsToHead.aj (added)
+++ labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/AddDojoMethodsToHead.aj Mon Jan 12 07:55:45 2009
@@ -0,0 +1,41 @@
+package org.apache.magma.dojo;
+
+import java.io.OutputStream;
+
+import org.apache.magma.settings.Settings;
+import org.apache.magma.website.Head;
+import org.apache.magma.website.utils.URLRewritingStream;
+
+public aspect AddDojoMethodsToHead {
+
+ public void Head.addDojo() {
+ if (Settings.isDeveloperEnv()) {
+ addExternalScript("magma:/dojo/dojo/dojo.js.uncompressed.js");
+ } else {
+ addExternalScript("magma:/dojo/dojo/dojo.js");
+ }
+ addOnloadScript();
+ addExternalScript("magma:/common/dojo/setTheme.js");
+ String baseurl = null;
+ OutputStream stream = getStream();
+ if (stream instanceof URLRewritingStream) {
+ baseurl = ((URLRewritingStream)stream).getCommonPrefix() + "dojo/";
+ } else {
+ baseurl = "/dojo/";
+ }
+ addRawScript("dojoBaseurl", "var dojoBaseurl = '" + baseurl + "';");
+ }
+
+ public void Head.addDojoCustomLayer(String name) {
+ if (Settings.isDeveloperEnv()) {
+ addExternalScript(name + ".uncompressed.js");
+ } else {
+ addExternalScript(name);
+ }
+ }
+
+ public void Head.addDojoOnload(String function) {
+ addDojo();
+ addRawScript("dojoonload-" + function, "dojo.addOnLoad(" + function + ");");
+ }
+}
Modified: labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/DojoWebHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/DojoWebHandler.java?rev=733820&r1=733819&r2=733820&view=diff
==============================================================================
--- labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/DojoWebHandler.java (original)
+++ labs/magma/trunk/website-dojo-pack/src/main/java/org/apache/magma/dojo/DojoWebHandler.java Mon Jan 12 07:55:45 2009
@@ -1,47 +1,13 @@
package org.apache.magma.dojo;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.magma.settings.Settings;
import org.apache.magma.website.Producer;
import org.apache.magma.website.ResourceProducer;
import org.apache.magma.website.WebHandler;
public class DojoWebHandler extends WebHandler {
- static Map<String, String> toUncompressed = new HashMap<String, String>();
- static Map<String, String> toCompressed = new HashMap<String, String>();
-
- static {
- toUncompressed.put("dojo/dojo.js", "dojo/dojo.js.uncompressed.js");
- toUncompressed.put("dijit/dijit.js", "dijit/dijit.js.uncompressed.js");
-
- toCompressed.put("dijit/dijit.js", "dijit/dijit.js");
- toCompressed.put("dijit/*", "dijit/dijit-all.js");
- toCompressed.put("dijit/form/*", "dijit/dijit-all.js");
- toCompressed.put("dijit/layout/*", "dijit/dijit-all.js");
- }
-
- private String translate(Map<String, String> set, String file) {
- String nfname = set.get(file);
- if (nfname != null) return nfname;
- if (file.indexOf('/') == -1) return file;
- nfname = file.substring(0, file.lastIndexOf('/'));
- nfname = set.get(nfname + "/*");
- if (nfname != null) return nfname;
- return file;
- }
-
@Override
public Producer doResource(String fileName) {
- /*
- if (Settings.isProductionEnv()) {
- fileName = translate(toCompressed, fileName);
- } else if (Settings.isDeveloperEnv()) {
- fileName = translate(toUncompressed, fileName);
- }
- */
fileName = "/dojo-1.2.0/" + fileName;
Producer res = super.doResource(fileName);
if (res instanceof ResourceProducer) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org