Merge branch 'develop' of github.com:ether/etherpad-lite into develop

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()
@@ -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'
   }
@@ -934,4 +935,4 @@ window.html10n = (function(window, document, undefined) {
     window._ = html10n.get;
 
   return html10n
-})(window, document)
+})(window, document)

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

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;
-
+    BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
     plugins.baseURL = baseURL;
     
     plugins.update(function () {