diff options
| author | Chad Weider <cweider@oofn.net> | 2012-05-28 13:50:55 -0700 |
|---|---|---|
| committer | Chad Weider <cweider@oofn.net> | 2012-05-28 15:14:52 -0700 |
| commit | 96ab3dc3b46a0f5d02d8ddb64d7ba2dcdb6b8aa6 (patch) | |
| tree | 0807e01b3860c0ccbd53e46ef62205bdc494cb5a /src | |
| parent | d5ac2bfb714e519d89b69c07ff0af19bef89ef62 (diff) | |
| download | etherpad-lite-96ab3dc3b46a0f5d02d8ddb64d7ba2dcdb6b8aa6.zip | |
jQuery is packaged - this is pure duplication.
Diffstat (limited to 'src')
| -rw-r--r-- | src/static/js/ace.js | 2 | ||||
| -rw-r--r-- | src/templates/pad.html | 3 | ||||
| -rw-r--r-- | src/templates/timeslider.html | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 7ae42cc9..87068d07 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -238,7 +238,6 @@ require.setGlobalKeyPath("require");\n\ iframeHTML.push(doctype); iframeHTML.push("<html><head>"); - iframeHTML.push('<script type="text/javascript" src="../static/js/jquery.js"></script>'); hooks.callAll("aceInitInnerdocbodyHead", { iframeHTML: iframeHTML @@ -279,6 +278,7 @@ require.setGlobalKeyPath("require");\n\ '); iframeHTML.push('<script type="text/javascript">'); + iframeHTML.push('$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").jQuery; // Expose jQuery #HACK'); iframeHTML.push('require("ep_etherpad-lite/static/js/ace2_inner");'); iframeHTML.push('<\/script>'); diff --git a/src/templates/pad.html b/src/templates/pad.html index 27e69927..6c6979db 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -313,7 +313,6 @@ <% e.begin_block("scripts"); %> <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> <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/ace2_common.js?callback=require.define"></script> @@ -331,6 +330,8 @@ require.setLibraryURI(baseURL + "javascripts/lib"); require.setGlobalKeyPath("require"); + $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK + if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) { document.domain = document.domain; // for comet } diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index ed5e206e..8e690d31 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -93,7 +93,6 @@ </div> <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> <script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script> <script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script> @@ -114,6 +113,8 @@ require.setLibraryURI(baseURL + "javascripts/lib"); require.setGlobalKeyPath("require"); + $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK + if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) { document.domain = document.domain; // for comet } |