diff options
| author | Chad Weider <cweider@oofn.net> | 2012-05-28 17:23:43 -0700 |
|---|---|---|
| committer | Chad Weider <cweider@oofn.net> | 2012-09-09 18:18:59 -0700 |
| commit | 19a7208c9742d14549b96c6c743c1407ec99531b (patch) | |
| tree | d3858f14e62b86dba65fb6184f6a34d07b3a212b /src/static | |
| parent | 0da4acfdb5a2884d5d69750cad245c6ca6a695e8 (diff) | |
| download | etherpad-lite-19a7208c9742d14549b96c6c743c1407ec99531b.zip | |
Clean up requires.
Diffstat (limited to 'src/static')
| -rw-r--r-- | src/static/js/pluginfw/hooks.js | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/static/js/pluginfw/hooks.js b/src/static/js/pluginfw/hooks.js index a3bd3f03..44f5fc3f 100644 --- a/src/static/js/pluginfw/hooks.js +++ b/src/static/js/pluginfw/hooks.js @@ -1,14 +1,6 @@ -var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); -var _; - -/* FIXME: Ugly hack, in the future, use same code for server & client */ -if (plugins.isClient) { - var async = require("async"); - var _ = require("ep_etherpad-lite/static/js/underscore"); -} else { - var async = require("async"); - var _ = require("underscore"); -} +var plugins = require("./plugins"); +var async = require("async"); +var _ = require("underscore"); exports.bubbleExceptions = true |