diff options
author | Simon B @piratpartiet <simonb@redhog.org> | 2010-04-22 00:16:22 +0200 |
---|---|---|
committer | Simon B @piratpartiet <simonb@redhog.org> | 2010-04-22 00:16:22 +0200 |
commit | c318ce528125da08ec3d4b4714d35e1b59de73eb (patch) | |
tree | 41693551056ecf7c11d0547293b7826d39564826 | |
parent | beb002e2b700305afae26355018c7f23441451c2 (diff) | |
download | etherpad-c318ce528125da08ec3d4b4714d35e1b59de73eb.tar.gz etherpad-c318ce528125da08ec3d4b4714d35e1b59de73eb.tar.xz etherpad-c318ce528125da08ec3d4b4714d35e1b59de73eb.zip |
Bugfix regession from IFRAME+IE bugs. Closes GH-70
-rw-r--r-- | infrastructure/ace/www/domline.js | 9 | ||||
-rw-r--r-- | infrastructure/ace/www/linestylefilter.js | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/infrastructure/ace/www/domline.js b/infrastructure/ace/www/domline.js index 016e868..f1d19e4 100644 --- a/infrastructure/ace/www/domline.js +++ b/infrastructure/ace/www/domline.js @@ -101,7 +101,14 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) { var extraOpenTags = ""; var extraCloseTags = ""; - parent.parent.plugins.callHook( + var plugins_; + if (typeof(plugins)!='undefined') { + plugins_ = plugins; + } else { + plugins_ = parent.parent.plugins; + } + + plugins_.callHook( "aceCreateDomLine", {domline:domline, cls:cls} ).map(function (modifier) { cls = modifier.cls; diff --git a/infrastructure/ace/www/linestylefilter.js b/infrastructure/ace/www/linestylefilter.js index 341345e..196cb63 100644 --- a/infrastructure/ace/www/linestylefilter.js +++ b/infrastructure/ace/www/linestylefilter.js @@ -238,7 +238,14 @@ linestylefilter.textAndClassFuncSplitter = function(func, splitPointsOpt) { linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser) { var func = linestylefilter.getURLFilter(lineText, textAndClassFunc); - var hookFilters = parent.parent.plugins.callHook( + var plugins_; + if (typeof(plugins)!='undefined') { + plugins_ = plugins; + } else { + plugins_ = parent.parent.plugins; + } + + var hookFilters = plugins_.callHook( "aceGetFilterStack", {linestylefilter:linestylefilter, browser:browser}); hookFilters.map(function (hookFilter) { func = hookFilter(lineText, func); |