From 3fb62956b9c004ebf412382d933b2c78e87fd545 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sun, 5 Feb 2012 11:13:43 -0800
Subject: [PATCH] Plugins are injected and no longer exist in the global scope.

---
 static/js/ace.js                    |  9 +++++++++
 static/js/contentcollector.js       | 17 ++---------------
 static/js/domline.js                | 17 ++---------------
 static/js/domline_client.js         | 17 ++---------------
 static/js/linestylefilter.js        | 27 +++------------------------
 static/js/linestylefilter_client.js | 27 +++------------------------
 static/js/plugins.js                |  2 +-
 7 files changed, 22 insertions(+), 94 deletions(-)

diff --git a/static/js/ace.js b/static/js/ace.js
index 6854b114..9efb5d74 100644
--- a/static/js/ace.js
+++ b/static/js/ace.js
@@ -337,6 +337,15 @@ function Ace2Editor()
       $$INCLUDE_JS("../static/js/domline.js");
       $$INCLUDE_JS("../static/js/ace2_inner.js");
       pushRequireScriptTo(iframeHTML);
+      // Inject my plugins into my child.
+      iframeHTML.push('\
+<script type="text/javascript">\
+  require.define("/plugins", null);\n\
+  require.define("/plugins.js", function (require, exports, module) {\
+    module.exports = parent.parent.require("/plugins");\
+  });\
+</script>\
+');
       pushScriptTagsFor(iframeHTML, includedJS);
 
       iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
diff --git a/static/js/contentcollector.js b/static/js/contentcollector.js
index fd90a07b..0437ccd7 100644
--- a/static/js/contentcollector.js
+++ b/static/js/contentcollector.js
@@ -26,12 +26,7 @@
 var _MAX_LIST_LEVEL = 8;
 
 var Changeset = require('/easysync2').Changeset
-var plugins = undefined;
-try {
-  plugins = require('/plugins').plugins;
-} catch (e) {
-  // silence
-}
+var plugins = require('/plugins').plugins;
 
 function sanitizeUnicode(s)
 {
@@ -42,15 +37,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
 {
   browser = browser || {};
 
-  var plugins_;
-  if (typeof(plugins) != 'undefined')
-  {
-    plugins_ = plugins;
-  }
-  else
-  {
-    plugins_ = parent.parent.plugins;
-  }
+  var plugins_ = plugins;
 
   var dom = domInterface || {
     isNodeText: function(n)
diff --git a/static/js/domline.js b/static/js/domline.js
index 5de33c5a..d89eeb46 100644
--- a/static/js/domline.js
+++ b/static/js/domline.js
@@ -26,12 +26,7 @@
 // requires: plugins
 // requires: undefined
 
-var plugins = undefined;
-try {
-  plugins = require('/plugins').plugins;
-} catch (e) {
-  // silence
-}
+var plugins = require('/plugins').plugins;
 
 var domline = {};
 domline.noop = function()
@@ -148,15 +143,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
     var extraOpenTags = "";
     var extraCloseTags = "";
 
-    var plugins_;
-    if (typeof(plugins) != 'undefined')
-    {
-      plugins_ = plugins;
-    }
-    else
-    {
-      plugins_ = parent.parent.plugins;
-    }
+    var plugins_ = plugins;
 
     plugins_.callHook("aceCreateDomLine", {
       domline: domline,
diff --git a/static/js/domline_client.js b/static/js/domline_client.js
index b999e358..09530714 100644
--- a/static/js/domline_client.js
+++ b/static/js/domline_client.js
@@ -25,12 +25,7 @@
 // requires: plugins
 // requires: undefined
 
-var plugins = undefined;
-try {
-  plugins = require('/plugins').plugins;
-} catch (e) {
-  // silence
-}
+var plugins = require('/plugins').plugins;
 
 var domline = {};
 domline.noop = function()
@@ -147,15 +142,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
     var extraOpenTags = "";
     var extraCloseTags = "";
 
-    var plugins_;
-    if (typeof(plugins) != 'undefined')
-    {
-      plugins_ = plugins;
-    }
-    else
-    {
-      plugins_ = parent.parent.plugins;
-    }
+    var plugins_ = plugins;
 
     plugins_.callHook("aceCreateDomLine", {
       domline: domline,
diff --git a/static/js/linestylefilter.js b/static/js/linestylefilter.js
index fa1b40de..6bb09f07 100644
--- a/static/js/linestylefilter.js
+++ b/static/js/linestylefilter.js
@@ -29,12 +29,7 @@
 // requires: undefined
 
 var Changeset = require('/easysync2').Changeset
-var plugins = undefined;
-try {
-  plugins = require('/plugins').plugins;
-} catch (e) {
-  // silence
-}
+var plugins = require('/plugins').plugins;
 
 var linestylefilter = {};
 
@@ -59,15 +54,7 @@ linestylefilter.getAuthorClassName = function(author)
 linestylefilter.getLineStyleFilter = function(lineLength, aline, textAndClassFunc, apool)
 {
 
-  var plugins_;
-  if (typeof(plugins) != 'undefined')
-  {
-    plugins_ = plugins;
-  }
-  else
-  {
-    plugins_ = parent.parent.plugins;
-  }
+  var plugins_ = plugins;
 
   if (lineLength == 0) return textAndClassFunc;
 
@@ -312,15 +299,7 @@ linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser)
 {
   var func = linestylefilter.getURLFilter(lineText, textAndClassFunc);
 
-  var plugins_;
-  if (typeof(plugins) != 'undefined')
-  {
-    plugins_ = plugins;
-  }
-  else
-  {
-    plugins_ = parent.parent.plugins;
-  }
+  var plugins_ = plugins;
 
   var hookFilters = plugins_.callHook("aceGetFilterStack", {
     linestylefilter: linestylefilter,
diff --git a/static/js/linestylefilter_client.js b/static/js/linestylefilter_client.js
index 7ff5bef4..8f1a6baf 100644
--- a/static/js/linestylefilter_client.js
+++ b/static/js/linestylefilter_client.js
@@ -27,12 +27,7 @@
 // requires: undefined
 
 var Changeset = require('/easysync2_client').Changeset
-var plugins = undefined;
-try {
-  plugins = require('/plugins').plugins;
-} catch (e) {
-  // silence
-}
+var plugins = require('/plugins').plugins;
 
 var linestylefilter = {};
 
@@ -57,15 +52,7 @@ linestylefilter.getAuthorClassName = function(author)
 linestylefilter.getLineStyleFilter = function(lineLength, aline, textAndClassFunc, apool)
 {
 
-  var plugins_;
-  if (typeof(plugins) != 'undefined')
-  {
-    plugins_ = plugins;
-  }
-  else
-  {
-    plugins_ = parent.parent.plugins;
-  }
+  var plugins_ = plugins;
 
   if (lineLength == 0) return textAndClassFunc;
 
@@ -310,15 +297,7 @@ linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser)
 {
   var func = linestylefilter.getURLFilter(lineText, textAndClassFunc);
 
-  var plugins_;
-  if (typeof(plugins) != 'undefined')
-  {
-    plugins_ = plugins;
-  }
-  else
-  {
-    plugins_ = parent.parent.plugins;
-  }
+  var plugins_ = plugins;
 
   var hookFilters = plugins_.callHook("aceGetFilterStack", {
     linestylefilter: linestylefilter,
diff --git a/static/js/plugins.js b/static/js/plugins.js
index ce3ec9bd..963f055c 100644
--- a/static/js/plugins.js
+++ b/static/js/plugins.js
@@ -4,7 +4,7 @@
  * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
  */
 
-plugins = {
+var plugins = {
   callHook: function(hookName, args)
   {
     var global = (function () {return this}());