Adding Aloha-Editor plugin forked in github

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/mapstraction/mxn.git
 [submodule "submodules/Aloha-Editor"]
 	path = submodules/Aloha-Editor
-	url = git://github.com/alohaeditor/Aloha-Editor.git
+	url = git@github.com:popsimple/Aloha-Editor.git
 [submodule "submodules/Dolomite"]
 	path = submodules/Dolomite
 	url = git@github.com:sinelaw/Dolomite.git

scripts/update_aloha.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+cd submodules/Aloha-Editor/build
+ant all
+cp  -r out/aloha-nightly/aloha ../../../website/war/

shared/src/com/project/shared/client/net/DynamicSourceLoader.java

@@ -25,15 +25,8 @@ private DynamicSourceLoader(String source, SimpleEvent.Handler<Void> handler)
         this.handler = handler;
         String normalizedSource = source.toLowerCase().trim();
         Element elem = null;
-        if (normalizedSource.endsWith(".js"))
-        {
-            ScriptElement scriptElem = Document.get().createScriptElement();
-            scriptElem.setSrc(source);
-            // scriptElem.setLang("javascript"); // lang is deprecated?
-            scriptElem.setType("text/javascript");
-            elem = scriptElem;
-        }
-        else if (normalizedSource.endsWith(".css"))
+        // TODO: replace the endsWith heuristic with a parameter that tells what type of element to create or a function that creates the proper element
+        if (normalizedSource.endsWith(".css"))
         {
             LinkElement linkElem = Document.get().createLinkElement();
             linkElem.setHref(source);
@@ -42,7 +35,12 @@ else if (normalizedSource.endsWith(".css"))
             elem = linkElem;
         }
         else {
-            throw new UnsupportedOperationException("Don't know how to load non-js/css source: '" + source + "'");
+            // If it isn't css, assume it's javascript (sometimes javascript urls don't end with .js because they are queries that dynamically generate js)
+            ScriptElement scriptElem = Document.get().createScriptElement();
+            scriptElem.setSrc(source);
+            // scriptElem.setLang("javascript"); // lang is deprecated?
+            scriptElem.setType("text/javascript");
+            elem = scriptElem;
         }
         this.registerLoadedHandler(elem);
         Document.get().getElementsByTagName("head").getItem(0).appendChild(elem);

website/gae.txt

@@ -41,4 +41,4 @@ Password: g734FGQ@Ssdjf
 Apps - Users & Groups
 ---------------------
 no-reply: LevnNV13
-
+contact: hardugi1

website/src/com/project/website/canvas/client/Canvas.java

@@ -10,6 +10,7 @@
 import com.project.shared.utils.loggers.Logger;
 import com.project.website.canvas.client.canvastools.base.BuiltinTools;
 import com.project.website.canvas.client.canvastools.map.MapToolStaticUtils;
+import com.project.website.canvas.client.canvastools.textedit.AlohaEditor;
 import com.project.website.canvas.client.resources.CanvasResources;
 import com.project.website.shared.client.widgets.authentication.resources.AuthenticationResources;
 
@@ -24,23 +25,27 @@ public void onModuleLoad() {
         Logger.addLogger(GwtLogger.INSTANCE);
         Logger.addLogger(FirebugLogger.INSTANCE);
 
+        // start loading the maps, aloha apis immediately, in case it will be needed later.
+        MapToolStaticUtils.loadApi();
+        AlohaEditor.loadApi();
+
+        // Make sure we have all resources loaded
         CanvasResources.INSTANCE.main().ensureInjected();
         AuthenticationResources.INSTANCE.main().ensureInjected();
 
+        // Register the built-in canvas tools
         BuiltinTools.init();
-        RootPanel.get("root").add(this.canvasContainer);
-
-
-        // start loading the maps api immediately, in case it will be needed later.
-        MapToolStaticUtils.loadApi();
 
+        RootPanel.get("root").add(this.canvasContainer);
 
         History.addValueChangeHandler(new ValueChangeHandler<String>() {
             @Override
             public void onValueChange(ValueChangeEvent<String> event) {
                 canvasContainer.getWorksheet().load(event.getValue());
             }
         });
+
+        // Go get'em!
         History.fireCurrentHistoryState();
     }
 }

website/src/com/project/website/canvas/client/canvastools/textedit/AlohaEditor.java

@@ -0,0 +1,14 @@
+package com.project.website.canvas.client.canvastools.textedit;
+
+import com.project.shared.client.net.DynamicSourceLoader;
+
+public class AlohaEditor
+{
+
+    private static final String ALOHA_SCRIPT_URL = "aloha/aloha.js";
+
+    public static void loadApi()
+    {
+        DynamicSourceLoader.getLoadAsyncFunc(ALOHA_SCRIPT_URL).run(null);
+    }
+}

website/war/aloha/VERSION.txt

@@ -0,0 +1,2 @@
+nightly
+2011-09-08 11:44:39