From b767192c583c7ab41452eca4b4b593e20785bef1 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Wed, 11 Apr 2012 01:54:16 -0700
Subject: [PATCH 1/2] Revert "Made it possible to disable minification again"

This reverts commit 22eaa6ffc012e83438d54e6fb5b023a7952246a7.
---
 src/templates/pad.html | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 533bb2ba7..91583b360 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -276,21 +276,14 @@
             <script type="text/javascript" src="../static/js/require-kernel.js"></script>
             <script type="text/javascript" src="../static/js/jquery.js"></script>
             <script type="text/javascript" src="../socket.io/socket.io.js"></script>
-            <% if (settings.minify) { %>
-              <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
-            <% } %>
+            <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
             <script type="text/javascript">
                 document.domain = document.domain;
                 var clientVars = {};
                 (function () {
-                  <% if (settings.minify) { %>
-                    require.setRootURI("../javascripts/src");
-                    require.setLibraryURI("../javascripts/lib");
-                    require.setGlobalKeyPath("require");
-                  <% } else { %>
-                    require.setRootURI("../static/js");
-                    require.setLibraryURI("../static/plugins");
-                  <% } %>
+                  require.setRootURI("../javascripts/src");
+                  require.setLibraryURI("../javascripts/lib");
+                  require.setGlobalKeyPath("require");
 
                   var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
                   plugins.update(function () {

From e695c716e55258b562de7e652078730f1df489a2 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Wed, 11 Apr 2012 02:01:53 -0700
Subject: [PATCH 2/2] Work around strange order of execution bug in Firefox.
 Fixes #620

---
 src/static/js/pluginfw/plugins.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 5f44bb6f2..e6cb51905 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -85,15 +85,20 @@ exports.extractHooks = function (parts, hook_set_name) {
 
 if (exports.isClient) {
   exports.update = function (cb) {
+    // It appears that this response (see #620) may interrupt the current thread
+    // of execution on Firefox. This schedules the response in the run-loop,
+    // which appears to fix the issue.
+    var callback = function () {setTimeout(cb, 0);};
+
     jQuery.getJSON('/pluginfw/plugin-definitions.json', function(data) {
       exports.plugins = data.plugins;
       exports.parts = data.parts;
       exports.hooks = exports.extractHooks(exports.parts, "client_hooks");
       exports.loaded = true;
-      cb();
+      callback();
      }).error(function(xhr, s, err){
        console.error("Failed to load plugin-definitions: " + err);
-       cb();
+       callback();
      });
   };
 } else {