diff options
| author | Chad Weider <cweider@oofn.net> | 2012-01-29 03:30:31 -0800 |
|---|---|---|
| committer | Chad Weider <cweider@oofn.net> | 2012-02-19 20:43:17 -0800 |
| commit | dcc07406216448ec85623ecf8d976f32e4831744 (patch) | |
| tree | e710c6c48a400f03ae6ded2823721786858fed38 /static | |
| parent | b661ef5960fd0d22a069b72d83892418c34e569d (diff) | |
| download | etherpad-lite-dcc07406216448ec85623ecf8d976f32e4831744.zip | |
Use Yajsml to combine files.
Minify only constructs individual files and optionally compresses them with UglifyJS.
Diffstat (limited to 'static')
| -rw-r--r-- | static/js/ace.js | 2 | ||||
| -rw-r--r-- | static/pad.html | 2 | ||||
| -rw-r--r-- | static/timeslider.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/static/js/ace.js b/static/js/ace.js index 04930910..bdb2f4f3 100644 --- a/static/js/ace.js +++ b/static/js/ace.js @@ -238,7 +238,7 @@ function Ace2Editor() } else { file = ACE_SOURCE; file = file.replace(/^\.\.\/static\/js\//, '../minified/'); - buffer.push('<script type="application/javascript" src="' + file + '"><\/script>'); + buffer.push('<script type="application/javascript" src="' + file + '?callback=require.define"><\/script>'); buffer.push('<script type="text/javascript">'); buffer.push('require("/ace2_inner");'); buffer.push('<\/script>'); diff --git a/static/pad.html b/static/pad.html index 0345d65b..3f7fe8f2 100644 --- a/static/pad.html +++ b/static/pad.html @@ -290,7 +290,7 @@ <script type="text/javascript" src="../static/js/require-kernel.js"></script> <script type="text/javascript" src="../socket.io/socket.io.js"></script> - <script type="text/javascript" src="../minified/pad.js"></script> + <script type="text/javascript" src="../minified/pad.js?callback=require.define"></script> <script type="text/javascript" src="../static/custom/pad.js"></script> <script type="text/javascript"> var clientVars = {}; diff --git a/static/timeslider.html b/static/timeslider.html index 579e26ef..c629857a 100644 --- a/static/timeslider.html +++ b/static/timeslider.html @@ -199,7 +199,7 @@ <script type="text/javascript" src="../../static/js/require-kernel.js"></script> <script type="text/javascript" src="../../socket.io/socket.io.js"></script> -<script type="text/javascript" src="../../minified/timeslider.js"></script> +<script type="text/javascript" src="../../minified/timeslider.js?callback=require.define"></script> <script type="text/javascript" src="../../static/custom/timeslider.js"></script> <script type="text/javascript" > var clientVars = {}; |