repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 312c58ffa5e775a3ee47b698178ed4a724c1168b:
path_to: 
revision_to: 

commit 312c58ffa5e775a3ee47b698178ed4a724c1168b
Author: James Baicoianu 
Date:   Thu Sep 29 03:11:06 2016 -0700

    Disabled hacky init for remote-hosted janusweb.js (fixes JanusWeb embed, thanks Aussie)

diff --git a/scripts/room.js b/scripts/room.js

--- a/scripts/room.js
+++ b/scripts/room.js
@@ -237,6 +237,10 @@ elation.require([

       var translator = this.getTranslator(url);

+      /*
+      // Disabled - using outerHTML to get the source is a nice way to avoid an extra network trip,
+      // but due to how browser parsers work it means we can't get back unmodified XML, so it's best
+      // to just make an XHR call and let the browser cache handle it
       if (url == document.location.href) {
         setTimeout(elation.bind(this, function() {
           this.roomsrc = this.parseSource(document.documentElement.outerHTML);
@@ -245,8 +249,12 @@ elation.require([
           this.setActive();
           elation.events.fire({type: 'janus_room_load', element: this});
         }), 0);
-      } else if (translator) {
+      } else 
+      */
+
+      if (translator) {
         setTimeout(elation.bind(this, function() {
+          // TODO - use the new official translators here!
           translator.exec({url: url, janus: this.properties.janus, room: this})
                     .then(elation.bind(this, function(objs) {
                       this.createRoomObjects(objs);
@@ -684,6 +692,7 @@ elation.require([
     this.applyEditXML = function(editxml) {
       var xml = elation.utils.parseXML('' + editxml + '');
       var edit = xml.edit._children;
+      if (!edit) return;
       var keys = Object.keys(edit);
       var hasNew = false;

@@ -920,14 +929,18 @@ elation.require([
         }
       }
       this.janus.scriptframeargs[0] = ev.data.delta * 1000;
-      (function(room) {
-        elation.events.fire({element: room, type: 'janusweb_script_frame'});
-        elation.events.fire({element: room, type: 'janusweb_script_frame_end'});
-      })(this);
+      elation.events.fire({element: this, type: 'janusweb_script_frame'});
+      elation.events.fire({element: this, type: 'janusweb_script_frame_end'});
     }
     this.getObjectById = function(js_id) {
       return this.jsobjects[js_id];
     }
+    this.openLink = function(js_id) {
+      var link = this.jsobjects[js_id];
+      if (link) {
+        link.activate();
+      }
+    }
     this.getObjectFromProxy = function(proxy, children) {
       return proxy._target;
 /*

-----END OF PAGE-----