diff options
| author | Chad Weider <cweider@oofn.net> | 2012-04-11 01:54:16 -0700 |
|---|---|---|
| committer | Chad Weider <cweider@oofn.net> | 2012-04-11 02:08:50 -0700 |
| commit | b767192c583c7ab41452eca4b4b593e20785bef1 (patch) | |
| tree | 80b61c7b00f0301cde5d3a2d30cf4fdd787681ef | |
| parent | 67d9f73ce91cf3177f0bd531869d634c3bc0a03b (diff) | |
| download | etherpad-lite-b767192c583c7ab41452eca4b4b593e20785bef1.zip | |
Revert "Made it possible to disable minification again"
This reverts commit 22eaa6ffc012e83438d54e6fb5b023a7952246a7.
| -rw-r--r-- | src/templates/pad.html | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html index 533bb2ba..91583b36 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -276,21 +276,14 @@ <script type="text/javascript" src="../static/js/require-kernel.js"></script> <script type="text/javascript" src="../static/js/jquery.js"></script> <script type="text/javascript" src="../socket.io/socket.io.js"></script> - <% if (settings.minify) { %> - <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script> - <% } %> + <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script> <script type="text/javascript"> document.domain = document.domain; var clientVars = {}; (function () { - <% if (settings.minify) { %> - require.setRootURI("../javascripts/src"); - require.setLibraryURI("../javascripts/lib"); - require.setGlobalKeyPath("require"); - <% } else { %> - require.setRootURI("../static/js"); - require.setLibraryURI("../static/plugins"); - <% } %> + require.setRootURI("../javascripts/src"); + require.setLibraryURI("../javascripts/lib"); + require.setGlobalKeyPath("require"); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); plugins.update(function () { |