diff options
Diffstat (limited to 'src/templates/timeslider.html')
| -rw-r--r-- | src/templates/timeslider.html | 3 |
1 files changed, 2 insertions, 1 deletions
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 } |