From 96ab3dc3b46a0f5d02d8ddb64d7ba2dcdb6b8aa6 Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Mon, 28 May 2012 13:50:55 -0700 Subject: [PATCH] jQuery is packaged - this is pure duplication. --- src/static/js/ace.js | 2 +- src/templates/pad.html | 3 ++- 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 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 }