summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.co.uk>2016-11-07 17:59:42 +0530
committerPranav Kant <pranavk@collabora.co.uk>2016-11-07 17:59:42 +0530
commit5f9a9264e4c824a805c182b061f11a9869123fe1 (patch)
tree8e984e6a1dd066c5c854d6aaf66bd188fd59e3ac
parent9f65377c424ab9316e184103e28a7ab77b2b8456 (diff)
Fix menubar l10n, set String.locale before requiring loleaflet
Change-Id: Ic5a22f05d0a11bd0485d0c88dfa34dcc6bfe29cf
-rw-r--r--loleaflet/main.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/loleaflet/main.js b/loleaflet/main.js
index 3528ea97a..831e6bf24 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -30,8 +30,6 @@ global.vex = vex;
global.devtools = require('devtools-detect');
var errorMessages = require('./dist/errormessages');
-var L = require('loleaflet');
-require('./dist/plugins/draw-0.2.4/dist/leaflet.draw.js');
function getParameterByName(name) {
name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
@@ -44,6 +42,9 @@ if (lang) {
String.locale = lang;
}
+var L = require('loleaflet');
+require('./dist/plugins/draw-0.2.4/dist/leaflet.draw.js');
+
var wopiSrc = getParameterByName('WOPISrc');
if (wopiSrc !== '' && access_token !== '') {