From c318ce528125da08ec3d4b4714d35e1b59de73eb Mon Sep 17 00:00:00 2001 From: "Simon B @piratpartiet" Date: Thu, 22 Apr 2010 00:16:22 +0200 Subject: Bugfix regession from IFRAME+IE bugs. Closes GH-70 --- infrastructure/ace/www/domline.js | 9 ++++++++- infrastructure/ace/www/linestylefilter.js | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'infrastructure/ace') 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); -- cgit v1.2.3