NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

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

Browse source
This commit is contained in:
John McLear 2013-04-11 17:05:24 +01:00
commit a81a40d75b
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/static/js/html10n.js
View file

@ -135,7 +135,7 @@ window.html10n = (function(window, document, undefined) {
for (var i=0, n=this.resources.length; i < n; i++) { for (var i=0, n=this.resources.length; i < n; i++) {
this.fetch(this.resources[i], lang, function(e) { this.fetch(this.resources[i], lang, function(e) {
reqs++; reqs++;
if(e) console.warn(e) if(e) consoleWarn(e)
if (reqs < n) return;// Call back once all reqs are completed if (reqs < n) return;// Call back once all reqs are completed
cb && cb() cb && cb()
@ -900,6 +900,7 @@ window.html10n = (function(window, document, undefined) {
* Returns the direction of the language returned be html10n#getLanguage * Returns the direction of the language returned be html10n#getLanguage
*/ */
html10n.getDirection = function() { html10n.getDirection = function() {
if(!this.language) return
var langCode = this.language.indexOf('-') == -1? this.language : this.language.substr(0, this.language.indexOf('-')) var langCode = this.language.indexOf('-') == -1? this.language : this.language.substr(0, this.language.indexOf('-'))
return html10n.rtl.indexOf(langCode) == -1? 'ltr' : 'rtl' return html10n.rtl.indexOf(langCode) == -1? 'ltr' : 'rtl'
} }
@ -934,4 +935,4 @@ window.html10n = (function(window, document, undefined) {
window._ = html10n.get; window._ = html10n.get;
return html10n return html10n
})(window, document) })(window, document)

3
src/static/js/timeslider.js
View file

@ -108,6 +108,7 @@ function init() {
}); });
exports.socket = socket; // make the socket available exports.socket = socket; // make the socket available
exports.BroadcastSlider = BroadcastSlider; // Make the slider available
hooks.aCallAll("postTimesliderInit"); hooks.aCallAll("postTimesliderInit");
}); });
@ -133,7 +134,7 @@ function sendSocketMsg(type, data)
var fireWhenAllScriptsAreLoaded = []; var fireWhenAllScriptsAreLoaded = [];
var BroadcastSlider, changesetLoader; var changesetLoader;
function handleClientVars(message) function handleClientVars(message)
{ {
//save the client Vars //save the client Vars

4
src/templates/timeslider.html
View file

@ -194,7 +194,7 @@
<!-- Bootstrap --> <!-- Bootstrap -->
<script type="text/javascript" > <script type="text/javascript" >
var clientVars = {}; var clientVars = {};
var BroadcastSlider;
(function () { (function () {
var pathComponents = location.pathname.split('/'); var pathComponents = location.pathname.split('/');
@ -214,7 +214,7 @@
var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
var socket = require('ep_etherpad-lite/static/js/timeslider').socket; var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
plugins.baseURL = baseURL; plugins.baseURL = baseURL;
plugins.update(function () { plugins.update(function () {