summaryrefslogtreecommitdiff
path: root/src/templates
diff options
context:
space:
mode:
authorjoassouza <joassouzasantos@gmail.com>2015-12-01 11:53:49 -0300
committerjoassouza <joassouzasantos@gmail.com>2015-12-01 11:53:49 -0300
commit4c8c1f53b56f0caadd725a5e423042bed5d2c4c8 (patch)
tree1f6b27e1cb7107e319b39547e3b1350aafe0d8a3 /src/templates
parent8a79ae6e0229075dcc4d153463e5e27233746b97 (diff)
downloadetherpad-lite-4c8c1f53b56f0caadd725a5e423042bed5d2c4c8.zip
Update the bowser.js to the new version
With this new version of bowser.js is possible detect the OS as well, no only the browser as the previous one. It brings support to new browsers as well.
Diffstat (limited to 'src/templates')
-rw-r--r--src/templates/pad.html2
-rw-r--r--src/templates/timeslider.html14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 84f9fef8..7e38b472 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -390,7 +390,7 @@
require.setGlobalKeyPath("require");
$ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
- browser = require('ep_etherpad-lite/static/js/browser').browser;
+ browser = require('ep_etherpad-lite/static/js/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 6ec27c05..af0a8f02 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -68,7 +68,7 @@
<button class="stepper" id="rightstep"></button>
</div>
</div>
-
+
<div id="overlay">
<div id="overlay-inner">
<!-- -->
@@ -231,20 +231,20 @@
<!-- Bootstrap -->
<script type="text/javascript" >
var clientVars = {};
- var BroadcastSlider;
+ var BroadcastSlider;
(function () {
var pathComponents = location.pathname.split('/');
-
+
// Strip 'p', the padname and 'timeslider' from the pathname and set as baseURL
var baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/';
-
-
+
+
require.setRootURI(baseURL + "javascripts/src");
require.setLibraryURI(baseURL + "javascripts/lib");
require.setGlobalKeyPath("require");
$ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
- browser = require('ep_etherpad-lite/static/js/browser').browser;
+ browser = require('ep_etherpad-lite/static/js/browser');
if ((!browser.msie) && (!(browser.mozilla && browser.version.indexOf("1.8.") == 0))) {
document.domain = document.domain; // for comet
@@ -254,7 +254,7 @@
var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
plugins.baseURL = baseURL;
-
+
plugins.update(function () {
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
hooks.plugins = plugins;