diff options
| author | John McLear <john@mclear.co.uk> | 2014-11-23 14:15:41 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-11-23 14:15:41 +0000 |
| commit | 555d22245d363b0718a7bfa854957057ebbf80a8 (patch) | |
| tree | 8b263a74db8c8ca71235984c35fe19cdaeebd341 /src/templates | |
| parent | b0872cc447b5b89bc571a962462853106fa1a22d (diff) | |
| parent | 5f2e830b72b82ec062dca7237cc7f1796a4f32f4 (diff) | |
| download | etherpad-lite-555d22245d363b0718a7bfa854957057ebbf80a8.zip | |
Merge pull request #2335 from ether/javascript-bower
swap out jquery browser for bower but expose browser object to all pages...
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/pad.html | 4 | ||||
| -rw-r--r-- | src/templates/timeslider.html | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html index f0267002..c20530ef 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -367,8 +367,8 @@ 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))) { + browser = require('ep_etherpad-lite/static/js/browser').browser; + 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 fceb894f..1fab0279 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -215,8 +215,9 @@ require.setGlobalKeyPath("require"); $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK + browser = require('ep_etherpad-lite/static/js/browser').browser; - if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) { + if ((!browser.msie) && (!(browser.mozilla && browser.version.indexOf("1.8.") == 0))) { document.domain = document.domain; // for comet } |