From 8836981e32f1caa909f8ba22e1619fedd867b396 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 9 Apr 2013 15:55:14 +0100
Subject: [PATCH 1/4] expose broadcast slider so plugins can interact with it

---
 src/static/js/timeslider.js   | 3 ++-
 src/templates/timeslider.html | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index cd98deadd..194899617 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -108,6 +108,7 @@ function init() {
     });
 
     exports.socket = socket; // make the socket available
+    exports.BroadcastSlider = BroadcastSlider; // Make the slider available
 
     hooks.aCallAll("postTimesliderInit");
   });
@@ -133,7 +134,7 @@ function sendSocketMsg(type, data)
 
 var fireWhenAllScriptsAreLoaded = [];
   
-var BroadcastSlider, changesetLoader;
+var changesetLoader;
 function handleClientVars(message)
 {
   //save the client Vars
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index d3062449f..265ea2a51 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -194,7 +194,7 @@
 <!-- Bootstrap -->
 <script type="text/javascript" >
   var clientVars = {};
-  
+  var BroadcastSlider;  
   (function () {
     var pathComponents = location.pathname.split('/');
     
@@ -214,7 +214,7 @@
 
     var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
     var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
-
+    var BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
     plugins.baseURL = baseURL;
     
     plugins.update(function () {

From 9dfac791074c846c87a51a88cfb5c81d6dd4149d Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 9 Apr 2013 15:58:18 +0100
Subject: [PATCH 2/4] no need to declare var twice

---
 src/templates/timeslider.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 265ea2a51..afacaf23d 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -214,7 +214,7 @@
 
     var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
     var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
-    var BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
+    BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
     plugins.baseURL = baseURL;
     
     plugins.update(function () {

From c755633f0920ce45415e305b9ac6ee07070a6170 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 10 Apr 2013 17:56:09 +0200
Subject: [PATCH 3/4] Update html10n.js to correctly use the console.log shim

fixes #1724
---
 src/static/js/html10n.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/html10n.js b/src/static/js/html10n.js
index 406409ada..90f84ff97 100644
--- a/src/static/js/html10n.js
+++ b/src/static/js/html10n.js
@@ -135,7 +135,7 @@ window.html10n = (function(window, document, undefined) {
       for (var i=0, n=this.resources.length; i < n; i++) {
         this.fetch(this.resources[i], lang, function(e) {
           reqs++;
-          if(e) console.warn(e)
+          if(e) consoleWarn(e)
           
           if (reqs < n) return;// Call back once all reqs are completed
           cb && cb()
@@ -934,4 +934,4 @@ window.html10n = (function(window, document, undefined) {
     window._ = html10n.get;
 
   return html10n
-})(window, document)
\ No newline at end of file
+})(window, document)

From 594757cc472bde48aee92043f2103238faeac158 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 11 Apr 2013 18:51:49 +0300
Subject: [PATCH 4/4] html10n.js: Don't break in getDirection if language
 hasn't been set

fixes #1724
---
 src/static/js/html10n.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/static/js/html10n.js b/src/static/js/html10n.js
index 90f84ff97..e1c884cd4 100644
--- a/src/static/js/html10n.js
+++ b/src/static/js/html10n.js
@@ -900,6 +900,7 @@ window.html10n = (function(window, document, undefined) {
    * Returns the direction of the language returned be html10n#getLanguage
    */
   html10n.getDirection = function() {
+    if(!this.language) return
     var langCode = this.language.indexOf('-') == -1? this.language : this.language.substr(0, this.language.indexOf('-'))
     return html10n.rtl.indexOf(langCode) == -1? 'ltr' : 'rtl'
   }