Made it possible to disable minification again

pull/557/head
Egil Moeller 2012-03-22 18:35:06 +01:00
parent b8a4333d1b
commit 22eaa6ffc0
1 changed files with 14 additions and 4 deletions

View File

@ -1,3 +1,6 @@
<%
var settings = require("ep_etherpad-lite/node/utils/Settings");
%>
<!doctype html>
<html>
@ -268,13 +271,20 @@
<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">
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");
<% } %>
var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
plugins.update(function () {