diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-27 16:44:50 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-27 16:44:50 +0100 |
| commit | 0b3182ce6e606d7f87cfd25fb58602980b41bc97 (patch) | |
| tree | 0e5d00df3a336da349b15bfa2820d5b6657ea8ed /infrastructure | |
| parent | f4ecb89a52eeeb50cea55894421fa9b4e1b26bd9 (diff) | |
| download | etherpad-0b3182ce6e606d7f87cfd25fb58602980b41bc97.tar.gz etherpad-0b3182ce6e606d7f87cfd25fb58602980b41bc97.tar.xz etherpad-0b3182ce6e606d7f87cfd25fb58602980b41bc97.zip | |
Bugfix for the ace callHook support
Diffstat (limited to 'infrastructure')
| -rw-r--r-- | infrastructure/ace/www/domline.js | 2 | ||||
| -rw-r--r-- | infrastructure/ace/www/linestylefilter.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/infrastructure/ace/www/domline.js b/infrastructure/ace/www/domline.js index 38cddf5..90e9943 100644 --- a/infrastructure/ace/www/domline.js +++ b/infrastructure/ace/www/domline.js @@ -101,7 +101,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) { var extraOpenTags = ""; var extraCloseTags = ""; - ((top == undefined) ? plugins : top.plugins).callHook( + (function () { try { return top.plugins; } catch (e) { return 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 d69376a..c163120 100644 --- a/infrastructure/ace/www/linestylefilter.js +++ b/infrastructure/ace/www/linestylefilter.js @@ -238,7 +238,7 @@ linestylefilter.textAndClassFuncSplitter = function(func, splitPointsOpt) { linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser) { var func = linestylefilter.getURLFilter(lineText, textAndClassFunc); - var hookFilters = ((top == undefined) ? plugins : top.plugins).callHook( + var hookFilters = (function () { try { return top.plugins; } catch (e) { return plugins; }; })().callHook( "aceGetFilterStack", {linestylefilter:linestylefilter, browser:browser}); hookFilters.map(function (hookFilter) { func = hookFilter(lineText, func); |