From 19a7208c9742d14549b96c6c743c1407ec99531b Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Mon, 28 May 2012 17:23:43 -0700 Subject: [PATCH] Clean up requires. --- src/static/js/pluginfw/hooks.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/static/js/pluginfw/hooks.js b/src/static/js/pluginfw/hooks.js index a3bd3f032..44f5fc3f0 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