diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 7ae42cc91..87068d07d 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("
"); - iframeHTML.push(''); hooks.callAll("aceInitInnerdocbodyHead", { iframeHTML: iframeHTML @@ -279,6 +278,7 @@ require.setGlobalKeyPath("require");\n\ '); iframeHTML.push(' - @@ -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 ed5e206e2..8e690d314 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -93,7 +93,6 @@ - @@ -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 }