summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/codeq/comms.js4
-rw-r--r--js/codeq/core.js84
-rw-r--r--js/codeq/init.js100
3 files changed, 103 insertions, 85 deletions
diff --git a/js/codeq/comms.js b/js/codeq/comms.js
index ad2376e..3671e95 100644
--- a/js/codeq/comms.js
+++ b/js/codeq/comms.js
@@ -198,7 +198,7 @@
},
ajaxPrefix, ajaxDataPrefix, ajaxResPrefix;
- ajaxPrefix = location.pathname;
+ ajaxPrefix = codeq.ajaxPrefix;
if (!ajaxPrefix) ajaxPrefix = '/';
else if (ajaxPrefix[ajaxPrefix.length - 1] !== '/') {
ajaxPrefix = ajaxPrefix.split('/');
@@ -233,7 +233,7 @@
else {
// create a new connection
connectPromise = deferred;
- socket = eio('ws://' + location.host, {
+ socket = eio(codeq.eioHost, {
'upgrade': true,
'path': '/ws',
'transports': ['polling', 'websocket']
diff --git a/js/codeq/core.js b/js/codeq/core.js
index 2d88f18..02bc2f0 100644
--- a/js/codeq/core.js
+++ b/js/codeq/core.js
@@ -393,6 +393,7 @@
'en': 'English',
'sl': 'Slovenščina'
},
+ 'isWebApp': false, // this is a PhoneGap/Cordova build, will be overridden in cordova.js for webapp
'getLang': function () {
return lang;
},
@@ -570,87 +571,4 @@
}
}
};
-
- var loadGuiTranslations = function () {
- var langs = codeq.availableLangs,
- loaders = [],
- loaderLangs = [],
- i, lang;
- for (i = langs.length - 1; i >= 0; i--) {
- lang = langs[i];
- loaders.push(codeq.comms.getGuiTranslation(lang));
- loaderLangs.push(lang);
- }
- return Q.all(loaders)
- .then(function (results) {
- // convert translations into something that the translation module can use
- var dictionary = {},
- i, json, key, lang, translations;
- for (i = results.length - 1; i >= 0; i--) {
- json = results[i];
- lang = loaderLangs[i];
- for (key in json) {
- if (!json.hasOwnProperty(key)) continue;
- translations = dictionary[key];
- if (translations) translations[lang] = json[key];
- else {
- translations = {};
- dictionary[key] = translations;
- translations[lang] = json[key];
- }
- }
- }
- // ensure each key contains all translations
- for (key in dictionary) {
- if (!dictionary.hasOwnProperty(key)) continue;
- translations = dictionary[key];
- for (i = langs.length - 1; i >= 0; i--) {
- lang = langs[i];
- if (!(lang in translations)) translations[lang] = "(Untranslated: " + lang + ")";
- }
- }
- // register with the system
- codeq.tr.registerDictionary('gui', dictionary);
- });
- };
-
- // ================================================================================
- // The boot sequence
- // ================================================================================
-
- $(document).ready(function () {
- // set the language
- var navigatorLang = navigator.language || navigator.browserLanguage, // language reported by browser
- lang = null, // the translation language that will be chosen
- key;
- if (typeof navigatorLang === 'string') {
- navigatorLang = navigatorLang.split('-')[0]; // truncate the language variant, in eg. en-US
- }
- else navigatorLang = 'en';
- for (key in codeq.supportedLangs) {
- if (!codeq.supportedLangs.hasOwnProperty(key)) continue;
- if (key === navigatorLang) lang = key; // we support the browser's language
- codeq.availableLangs.push(key);
- }
-
- // the boot chain of async handlers: must be a sequence of .then() terminated with a .fail().done()
- loadGuiTranslations()
- .then(codeq.comms.getResourceTree)
- .then(function (resourceTree) {
- resources = resourceTree; // save the loaded resource tree to the internal variable
-
- codeq.fire('init'); // tell any interested modules that we are now initialized, perhaps they want to initialize too
- codeq.setLang(lang || 'en'); // initial language setting, this also translates the GUI
- // go to login
- codeq.globalStateMachine.transition('login');
-
- //For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning you must initialize them yourself.
- $('[data-toggle="popover"]').popover()
- })
- .fail(function (e) {
- codeq.log.error('CodeQ failed to start: ' + e, e);
- alert('CodeQ failed to start: ' + e);
- })
- .done();
- });
})();
diff --git a/js/codeq/init.js b/js/codeq/init.js
new file mode 100644
index 0000000..b7e903c
--- /dev/null
+++ b/js/codeq/init.js
@@ -0,0 +1,100 @@
+(function () {
+
+
+ var loadGuiTranslations = function () {
+ var langs = codeq.availableLangs,
+ loaders = [],
+ loaderLangs = [],
+ i, lang;
+ for (i = langs.length - 1; i >= 0; i--) {
+ lang = langs[i];
+ loaders.push(codeq.comms.getGuiTranslation(lang));
+ loaderLangs.push(lang);
+ }
+ return Q.all(loaders)
+ .then(function (results) {
+ // convert translations into something that the translation module can use
+ var dictionary = {},
+ i, json, key, lang, translations;
+ for (i = results.length - 1; i >= 0; i--) {
+ json = results[i];
+ lang = loaderLangs[i];
+ for (key in json) {
+ if (!json.hasOwnProperty(key)) continue;
+ translations = dictionary[key];
+ if (translations) translations[lang] = json[key];
+ else {
+ translations = {};
+ dictionary[key] = translations;
+ translations[lang] = json[key];
+ }
+ }
+ }
+ // ensure each key contains all translations
+ for (key in dictionary) {
+ if (!dictionary.hasOwnProperty(key)) continue;
+ translations = dictionary[key];
+ for (i = langs.length - 1; i >= 0; i--) {
+ lang = langs[i];
+ if (!(lang in translations)) translations[lang] = "(Untranslated: " + lang + ")";
+ }
+ }
+ // register with the system
+ codeq.tr.registerDictionary('gui', dictionary);
+ });
+ };
+
+ // ================================================================================
+ // The boot sequence
+ // ================================================================================
+
+ var Boot = function () {
+ // set the language
+ var navigatorLang = navigator.language || navigator.browserLanguage, // language reported by browser
+ lang = null, // the translation language that will be chosen
+ key;
+ if (typeof navigatorLang === 'string') {
+ navigatorLang = navigatorLang.split('-')[0]; // truncate the language variant, in eg. en-US
+ }
+ else navigatorLang = 'en';
+ for (key in codeq.supportedLangs) {
+ if (!codeq.supportedLangs.hasOwnProperty(key)) continue;
+ if (key === navigatorLang) lang = key; // we support the browser's language
+ codeq.availableLangs.push(key);
+ }
+
+ // the boot chain of async handlers: must be a sequence of .then() terminated with a .fail().done()
+ loadGuiTranslations()
+ .then(codeq.comms.getResourceTree)
+ .then(function (resourceTree) {
+ resources = resourceTree; // save the loaded resource tree to the internal variable
+
+ codeq.fire('init'); // tell any interested modules that we are now initialized, perhaps they want to initialize too
+ codeq.setLang(lang || 'en'); // initial language setting, this also translates the GUI
+ // go to login
+ codeq.globalStateMachine.transition('login');
+
+ //For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning you must initialize them yourself.
+ $('[data-toggle="popover"]').popover()
+ })
+ .fail(function (e) {
+ codeq.log.error('CodeQ failed to start: ' + e, e);
+ alert('CodeQ failed to start: ' + e);
+ })
+ .done();
+ };
+
+ if (codeq.isWebApp) {
+ // we are a web app
+ $(window).on('load', Boot);
+ codeq.ajaxPrefix = location.pathname;
+ codeq.eioHost= 'ws://' + location.host;
+ }
+ else {
+ // we are a phonegap native app
+ document.addEventListener("deviceready", Boot, false);
+ codeq.ajaxPrefix = 'http://codeq.si/';
+ codeq.eioHost= 'ws://codeq.si';
+ }
+
+})();