Merge pull request #1204 from juanjoDiaz/small_improvements

Small improvements

diff --combined app/ui.js
index db3b1f373fb1fb7b42162ce55ce5bd6b566f7e36,67af7cda1ab45c5f43ee646f1d725c1fad2124fc..17ec48d4bd04dd151ccc151603ae13b6a825d9d7
--- 1/app/ui.js
--- 2/app/ui.js
+++ b/app/ui.js
@@@ -39,22 -39,20 +39,20 @@@ const UI = 
      reconnect_callback: null,
      reconnect_password: null,
  
-     prime(callback) {
-         if (document.readyState === "interactive" || document.readyState === "complete") {
-             UI.load(callback);
-         } else {
-             document.addEventListener('DOMContentLoaded', UI.load.bind(UI, callback));
-         }
-     },
+     prime() {
+         return WebUtil.initSettings().then(() => {
+             if (document.readyState === "interactive" || document.readyState === "complete") {
+                 return UI.start();
+             }
  
-     // Setup rfb object, load settings from browser storage, then call
-     // UI.init to setup the UI/menus
-     load(callback) {
-         WebUtil.initSettings(UI.start, callback);
+             return new Promise((resolve, reject) => {
+                 document.addEventListener('DOMContentLoaded', () => UI.start().then(resolve).catch(reject));
+             });
+         });
      },
  
      // Render default UI and initialize settings menu
-     start(callback) {
+     start() {
  
          UI.initSettings();
  
@@@ -105,9 -103,7 +103,7 @@@
              UI.openConnectPanel();
          }
  
-         if (typeof callback === "function") {
-             callback(UI.rfb);
-         }
+         return Promise.resolve(UI.rfb);
      },
  
      initFullscreen() {
@@@ -1644,20 -1640,15 +1640,15 @@@
  };
  
  // Set up translations
 -const LINGUAS = ["cs", "de", "el", "es", "ko", "nl", "pl", "sv", "tr", "zh_CN", "zh_TW"];
 +const LINGUAS = ["cs", "de", "el", "es", "ko", "nl", "pl", "ru", "sv", "tr", "zh_CN", "zh_TW"];
  l10n.setup(LINGUAS);
- if (l10n.language !== "en" && l10n.dictionary === undefined) {
-     WebUtil.fetchJSON('app/locale/' + l10n.language + '.json', (translations) => {
-         l10n.dictionary = translations;
- 
-         // wait for translations to load before loading the UI
-         UI.prime();
-     }, (err) => {
-         Log.Error("Failed to load translations: " + err);
-         UI.prime();
-     });
- } else {
+ if (l10n.language === "en" || l10n.dictionary !== undefined) {
      UI.prime();
+ } else {
+     WebUtil.fetchJSON('app/locale/' + l10n.language + '.json')
+         .then((translations) => { l10n.dictionary = translations; })
+         .catch(err => Log.Error("Failed to load translations: " + err))
+         .then(UI.prime);
  }
  
  export default UI;