External editors.

- Do the right dance so that they can be loaded both locally and in the cloud.

editor/external.ts

@@ -13,23 +13,35 @@ module TDev {
         path: string;
     }
 
-    export var externalEditors: ExternalEditor[] = [ {
-        name: "C++ Editor",
-        description: "Directly write C++ code using Ace (OUTDATED)",
-        id: "ace",
-        origin: "http://localhost:4242",
-        path: "/editor/local/ace/editor.html"
-    }, {
-        name: "Blockly editor",
-        description: "Great block-based environment!",
-        id: "blockly",
-        origin: "http://localhost:4242",
-        path: "/editor/local/blockly/editor.html"
-    } ];
+    var externalEditorsCache: ExternalEditor[] = null;
+
+    export function getExternalEditors(): ExternalEditor[] {
+        if (!externalEditorsCache) {
+            // Detect at run-time where we're running from!
+            var url = Ticker.mainJsName.replace(/main.js$/, "");
+            var match = url.match(/(https?:\/\/[^\/]+)(.*)/);
+            var origin = match[1];
+            var path = match[2];
+            externalEditorsCache = [ {
+                name: "C++ Editor",
+                description: "Directly write C++ code using Ace (OUTDATED)",
+                id: "ace",
+                origin: origin,
+                path: path+"ace/editor.html"
+            }, {
+                name: "Blockly editor",
+                description: "Great block-based environment!",
+                id: "blockly",
+                origin: origin,
+                path: path+"blockly/editor.html"
+            } ];
+        }
+        return externalEditorsCache;
+    }
 
     // Assumes that [id] is a valid external editor id.
     export function editorById(id: string): ExternalEditor {
-        var r = externalEditors.filter(x => x.id == id);
+        var r = getExternalEditors().filter(x => x.id == id);
         Util.assert(r.length == 1);
         return r[0];
     }
@@ -55,8 +67,10 @@ module TDev {
 
             public receive(event) {
                 console.log("[outer message]", event);
-                if (event.origin != this.editor.origin)
+                if (event.origin != this.editor.origin) {
+                    console.error("[outer message] not from the right origin!", event.origin, this.editor.origin);
                     return;
+                }
 
                 switch ((<Message> event.data).type) {
                     case MessageType.Save: {

editor/hub.ts

@@ -1015,7 +1015,7 @@ module TDev.Browser {
                 m.onDismiss = () => onSuccess(undefined);
 
                 var elts = [];
-                externalEditors.concat([{
+                getExternalEditors().concat([{
                     name: "TouchDevelop",
                     description: "The touch editor you love and know!",
                     id: "touchdevelop",

www/ace/ace-main.ts

@@ -12,6 +12,7 @@ module TDev {
     var allowedOrigins = {
         "http://localhost:4242": null,
         "http://www.touchdevelop.com": null,
+        "https://mbitmain.azurewebsites.net": null
     };
 
     // Both of these are written once when we receive the first (trusted)

www/blockly/blockly-main.ts

@@ -9,6 +9,7 @@ module TDev {
     var allowedOrigins: { [index: string]: any } = {
         "http://localhost:4242": null,
         "http://www.touchdevelop.com": null,
+        "https://mbitmain.azurewebsites.net": null
     };
 
     // Both of these are written once when we receive the first (trusted)
@@ -21,8 +22,10 @@ module TDev {
     var inMerge: boolean = false;
 
     window.addEventListener("message", (event) => {
-        if (!(event.origin in allowedOrigins))
+        if (!(event.origin in allowedOrigins)) {
+            console.error("[inner message] not from the right origin!", event.origin);
             return;
+        }
 
         if (!outer || !origin) {
             outer = event.source;