diff --git a/static/js/ace.js b/static/js/ace.js
index 6854b1142..9efb5d74a 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('\
+\
+');
pushScriptTagsFor(iframeHTML, includedJS);
iframeHTML.push('');
diff --git a/static/js/contentcollector.js b/static/js/contentcollector.js
index fd90a07be..0437ccd7b 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 5de33c5aa..d89eeb464 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 b999e3589..095307141 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 fa1b40dee..6bb09f07b 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 7ff5bef41..8f1a6bafd 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 ce3ec9bd7..963f055cf 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}());