public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Made it possible to disable minification again" 

This reverts commit 22eaa6ffc0.
pull/622/head
Chad Weider 2012-04-11 01:54:16 -07:00
parent 67d9f73ce9
commit b767192c58
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/templates/pad.html
View File

@ -276,21 +276,14 @@
<script type="text/javascript" src="../static/js/require-kernel.js"></script> <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="../static/js/jquery.js"></script>
<script type="text/javascript" src="../socket.io/socket.io.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"> <script type="text/javascript">
document.domain = document.domain; document.domain = document.domain;
var clientVars = {}; var clientVars = {};
(function () { (function () {
<% if (settings.minify) { %> require.setRootURI("../javascripts/src");
require.setRootURI("../javascripts/src"); require.setLibraryURI("../javascripts/lib");
require.setLibraryURI("../javascripts/lib"); require.setGlobalKeyPath("require");
require.setGlobalKeyPath("require");
<% } else { %>
require.setRootURI("../static/js");
require.setLibraryURI("../static/plugins");
<% } %>
var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
plugins.update(function () { plugins.update(function () {