Lots of fixes

src/static/js/ace.js

@@ -199,28 +199,7 @@ define(['ep_etherpad-lite/static/js/pluginfw/hooks', 'underscore'], function (ho
           '));
 
         iframeHTML.push('<script type="text/javascript" src="../static/plugins/requirejs/require.js"></script>');
-
-        iframeHTML.push(scriptTag('\n\
-          var pathComponents = parent.parent.location.pathname.split("/");\n\
-          var baseURL = pathComponents.slice(0,pathComponents.length-2).join("/") + "/";\n\
-          requirejs.config({\n\
-            baseUrl: baseURL + "static/plugins",\n\
-            paths: {underscore: baseURL + "static/plugins/underscore/underscore"}\n\
-          });\n\
-          \n\
-          requirejs(["ep_etherpad-lite/static/js/rjquery", "ep_etherpad-lite/static/js/pluginfw/client_plugins", "ep_etherpad-lite/static/js/ace2_inner"], function (j, plugins, Ace2Inner) {\n\
-            jQuery = $ = window.jQuery = window.$ = j; // Expose jQuery #HACK\n\
-            \n\
-            plugins.adoptPluginsFromAncestorsOf(window, function () {\n\
-              var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");\n\
-              hooks.plugins = plugins;\n\
-              \n\
-              plugins.ensure(function () {\n\
-                Ace2Inner.init();\n\
-              });\n\
-            });\n\
-          });\n\
-        '));
+        iframeHTML.push('<script type="text/javascript" src="../static/plugins/ep_etherpad-lite/static/js/ace2_inner_main.js"></script>');
 
         iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
 

src/static/js/ace2_inner.js

@@ -20,7 +20,9 @@
  * limitations under the License.
  */
 
-define(["ep_etherpad-lite/static/js/rjquery", "underscore", 'ep_etherpad-lite/static/js/pluginfw/hooks'], function ($, _, hooks) {
+define(["ep_etherpad-lite/static/js/rjquery", "underscore", 'ep_etherpad-lite/static/js/pluginfw/hooks', 'ep_etherpad-lite/static/js/linestylefilter', 'ep_etherpad-lite/static/js/domline'], function ($, _, hooks, linestylefilterMod, domlineMod) {
+  var linestylefilter = linestylefilterMod.linestylefilter;
+  var domline = domlineMod.domline;
   var exports = {};
 
 var browser = require('./browser').browser;
@@ -50,11 +52,9 @@ function Ace2Inner(){
   var colorutils = require('./colorutils').colorutils;
   var makeContentCollector = require('./contentcollector').makeContentCollector;
   var makeCSSManager = require('./cssmanager').makeCSSManager;
-  var domline = require('./domline').domline;
   var AttribPool = require('./AttributePool');
   var Changeset = require('./Changeset');
   var ChangesetUtils = require('./ChangesetUtils');
-  var linestylefilter = require('./linestylefilter').linestylefilter;
   var SkipList = require('./skiplist');
   var undoModule = require('./undomodule').undoModule;
   var AttributeManager = require('./AttributeManager');
@@ -475,6 +475,7 @@ function Ace2Inner(){
       //console.log("Just did action for: "+type);
       cleanExit = true;
     }
+/*
     catch (e)
     {
       caughtErrors.push(
@@ -485,6 +486,7 @@ function Ace2Inner(){
       dmesg(e.toString());
       throw e;
     }
+*/
     finally
     {
       var cs = currentCallStack;

src/static/js/ace2_inner_main.js

@@ -0,0 +1,26 @@
+var pathComponents = parent.parent.location.pathname.split("/");
+var baseURL = pathComponents.slice(0,pathComponents.length-2).join("/") + "/";
+requirejs.config({
+  baseUrl: baseURL + "static/plugins",
+  paths: {underscore: baseURL + "static/plugins/underscore/underscore"}
+});
+
+requirejs(
+  [
+    "ep_etherpad-lite/static/js/rjquery",
+    "ep_etherpad-lite/static/js/pluginfw/client_plugins",
+    "ep_etherpad-lite/static/js/pluginfw/hooks",
+    "ep_etherpad-lite/static/js/ace2_inner"
+  ],
+  function (j, plugins, hooks, Ace2Inner) {
+    jQuery = $ = window.jQuery = window.$ = j; // Expose jQuery #HACK
+
+    plugins.adoptPluginsFromAncestorsOf(window, function () {
+      hooks.plugins = plugins;
+
+      plugins.ensure(function () {
+        Ace2Inner.init();
+      });
+    });
+  }
+);

src/static/js/broadcast.js

@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
+define(['ep_etherpad-lite/static/js/pluginfw/hooks', 'ep_etherpad-lite/static/js/linestylefilter', 'ep_etherpad-lite/static/js/domline', 'underscore'], function (hooks, linetyleFilterMod, domlineMod, _) {
+  var exports = {};
   var makeCSSManager = require('./cssmanager').makeCSSManager;
-var domline = require('./domline').domline;
+  var domline = domlineMod.domline;
   var AttribPool = require('./AttributePool');
   var Changeset = require('./Changeset');
-var linestylefilter = require('./linestylefilter').linestylefilter;
+  var linestylefilter = linetyleFilterMod.linestylefilter;
   var colorutils = require('./colorutils').colorutils;
-var _ = require('./underscore');
-var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
 
   // These parameters were global, now they are injected. A reference to the
   // Timeslider controller would probably be more appropriate.
@@ -594,3 +594,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
   }
 
   exports.loadBroadcastJS = loadBroadcastJS;
+
+  return exports;
+});

src/static/js/domline.js

@@ -26,10 +26,11 @@
 // requires: plugins
 // requires: undefined
 
+define(['ep_etherpad-lite/static/js/pluginfw/hooks', 'ep_etherpad-lite/static/js/linestylefilter', 'underscore'], function(hooks, linestylefilterMod, _) {
+  var exports = {};
+
   var Security = require('./security');
-var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
-var _ = require('./underscore');
-var lineAttributeMarker = require('./linestylefilter').lineAttributeMarker;
+  var lineAttributeMarker = linestylefilterMod.lineAttributeMarker;
   var noop = function(){};
 
 
@@ -319,3 +320,6 @@ domline.processSpaces = function(s, doesWrap)
   };
 
   exports.domline = domline;
+
+  return exports;
+});

src/static/js/linestylefilter.js

@@ -28,10 +28,11 @@
 // requires: plugins
 // requires: undefined
 
+define(['ep_etherpad-lite/static/js/pluginfw/hooks', 'underscore'], function (hooks, _) {
+  var exports = {};
+
   var Changeset = require('./Changeset');
-var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
   var linestylefilter = {};
-var _ = require('./underscore');
   var AttributeManager = require('./AttributeManager');
 
   linestylefilter.ATTRIB_CLASSES = {
@@ -363,3 +364,6 @@ linestylefilter.populateDomLine = function(textLine, aline, apool, domLineObj)
   };
 
   exports.linestylefilter = linestylefilter;
+
+  return exports;
+});

src/static/js/pluginfw/client_plugins.js

@@ -53,7 +53,7 @@ define(["ep_etherpad-lite/static/js/rjquery", "underscore", './shared'], functio
     var parentRequire = null;
     try {
       while (frame = frame.parent) {
-        if (typeof (frame.require) !== "undefined") {
+        if (typeof (frame.requirejs) !== "undefined") {
           parentRequire = frame.requirejs;
           break;
         }

src/static/js/pluginfw/hooks.js

@@ -70,18 +70,16 @@ exports.flatten = function (lst) {
 
 exports.callAll = function (hook_name, args) {
   if (!args) args = {};
-  if (exports.plugins){
-    if (exports.plugins.hooks[hook_name] === undefined) return [];
+  if (exports.plugins === undefined || exports.plugins.hooks[hook_name] === undefined) return [];
   return _.flatten(_.map(exports.plugins.hooks[hook_name], function (hook) {
     return hookCallWrapper(hook, hook_name, args);
   }), true);
 }
-}
 
 exports.aCallAll = function (hook_name, args, cb) {
   if (!args) args = {};
   if (!cb) cb = function () {};
-  if (exports.plugins.hooks[hook_name] === undefined) return cb(null, []);
+  if (exports.plugins === undefined || exports.plugins.hooks[hook_name] === undefined) return cb(null, []);
   async.map(
     exports.plugins.hooks[hook_name],
     function (hook, cb) {
@@ -95,7 +93,7 @@ exports.aCallAll = function (hook_name, args, cb) {
 
 exports.callFirst = function (hook_name, args) {
   if (!args) args = {};
-  if (exports.plugins.hooks[hook_name] === undefined) return [];
+  if (exports.plugins === undefined || exports.plugins.hooks[hook_name] === undefined) return [];
   return exports.syncMapFirst(exports.plugins.hooks[hook_name], function (hook) {
     return hookCallWrapper(hook, hook_name, args);
   });
@@ -104,7 +102,7 @@ exports.callFirst = function (hook_name, args) {
 exports.aCallFirst = function (hook_name, args, cb) {
   if (!args) args = {};
   if (!cb) cb = function () {};
-  if (exports.plugins.hooks[hook_name] === undefined) return cb(null, []);
+  if (exports.plugins === undefined || exports.plugins.hooks[hook_name] === undefined) return cb(null, []);
   exports.mapFirst(
     exports.plugins.hooks[hook_name],
     function (hook, cb) {

src/static/js/timeslider.js

@@ -27,8 +27,9 @@ define([
   'ep_etherpad-lite/static/js/rjquery',
   'ep_etherpad-lite/static/js/pluginfw/hooks',
   'ep_etherpad-lite/static/js/pad_utils',
-  'ep_etherpad-lite/static/js/broadcast_slider'
-], function($, hooks, padUtilsMod, broadcastSliderMod) {
+  'ep_etherpad-lite/static/js/broadcast_slider',
+  'ep_etherpad-lite/static/js/broadcast',
+], function($, hooks, padUtilsMod, broadcastSliderMod, broadcastMod) {
   var exports = {};
 
   JSON = window.requireKernel('./json2');
@@ -36,6 +37,11 @@ define([
   var createCookie = padUtilsMod.createCookie;
   var readCookie = padUtilsMod.readCookie;
   var randomString = padUtilsMod.randomString;
+  var broadcastRevisionsMod = require('./broadcast_revisions');
+  var padimpexpMod = require('./pad_impexp');
+
+    //initialize export ui
+    require('./pad_impexp').padimpexp.init();
 
   var token, padId, export_links;
 
@@ -142,11 +148,11 @@ define([
 
     //load all script that doesn't work without the clientVars
     BroadcastSlider = broadcastSliderMod.loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded);
-    require('./broadcast_revisions').loadBroadcastRevisionsJS();
-    changesetLoader = require('./broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
+    broadcastRevisionsMod.loadBroadcastRevisionsJS();
+    changesetLoader = broadcastMod.loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
 
     //initialize export ui
-    require('./pad_impexp').padimpexp.init();
+    padimpexpMod.padimpexp.init();
 
     //change export urls when the slider moves
     BroadcastSlider.onSlider(function(revno)

src/templates/pad.html

@@ -398,11 +398,9 @@
                 [
                   'ep_etherpad-lite/static/js/rjquery',
                   'ep_etherpad-lite/static/js/pluginfw/client_plugins',
-                  'ep_etherpad-lite/static/js/pluginfw/hooks',
-                  'ep_etherpad-lite/static/js/pad',
-                  'ep_etherpad-lite/static/js/chat',
-                  'ep_etherpad-lite/static/js/pad_editbar',
-                ], function ($, plugins, hooks, padMod, chatMod, padEditbarMod) {
+                  'ep_etherpad-lite/static/js/pluginfw/hooks'
+                ], function ($, plugins, hooks) {
+            console.log("hooks & plugins modules loaded");
                   window.$ = $; // Expose jQuery #HACK
                   window.jQuery = $;
 
@@ -415,14 +413,23 @@
                   plugins.update(function () {
                     hooks.plugins = plugins;
 
+            console.log("hooks.plugins initialized");
+
                     // Call documentReady hook
                     $(function() {
                       hooks.aCallAll('documentReady');
                     });
 
+                    requirejs(
+                      [
+                        'ep_etherpad-lite/static/js/pad',
+                        'ep_etherpad-lite/static/js/chat',
+                        'ep_etherpad-lite/static/js/pad_editbar',
+                      ], function (padMod, chatMod, padEditbarMod) {
+            console.log("pad loaded");
+
                         padMod.baseURL = baseURL;
                         padMod.init();
-                  });
 
                         /* TODO: These globals shouldn't exist. */
                         pad = padMod.pad;
@@ -431,6 +438,9 @@
                         padimpexp = window.requireKernel('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
                       }
                     );
+                  });
+                }
+              );
             }());
         </script>
         <% e.end_block(); %>