From 4bbfd5045e94b86eb2d73ad3efb39c144d291318 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Mon, 30 Jan 2017 20:29:04 +0100
Subject: [PATCH] ensure that JS is *really* only initialized after the DOM is
 fully loaded, resolves #166

---
 js/privatebin.js  | 13 ++++++-------
 tpl/bootstrap.php |  2 +-
 tpl/page.php      |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/js/privatebin.js b/js/privatebin.js
index fed80c3d..6ed88f03 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -397,27 +397,26 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
         },
 
         /**
-         * load translations into cache, then execute callback function
+         * load translations into cache, then trigger controller initialization
          *
          * @name   i18n.loadTranslations
          * @function
-         * @param  {Function} callback
          */
-        loadTranslations: function(callback)
+        loadTranslations: function()
         {
             var selectedLang = helper.getCookie('lang');
             var language = selectedLang.length > 0 ? selectedLang : (navigator.language || navigator.userLanguage).substring(0, 2);
             // note that 'en' is built in, so no translation is necessary
-            if (this.supportedLanguages.indexOf(language) === -1)
+            if (i18n.supportedLanguages.indexOf(language) === -1)
             {
-                callback();
+                controller.init();
             }
             else
             {
                 $.getJSON('i18n/' + language + '.json', function(data) {
                     i18n.language = language;
                     i18n.translations = data;
-                    callback();
+                    controller.init();
                 });
             }
         },
@@ -1713,7 +1712,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
      * main application start, called when DOM is fully loaded and
      * runs controller initalization after translations are loaded
      */
-    $(i18n.loadTranslations($.proxy(controller.init, controller)));
+    $(i18n.loadTranslations);
 
     return {
         helper: helper,
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 723b3e9b..8938112c 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -69,7 +69,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-x8GMx3+kjkTYcs0woYYfMJuezva4bPJ4UasYido780GxFWcVEB9YnEvb5tvGoissx2Vdymvb6bg7hgdmUG+8Cg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-YW9b0ChcI/zuJwUZxdQW3zb/LO999he3fOtiio2MhickC7YyrzgvIcgvFMUYZjJ79tYiNzDLmMAZKRMvqoQoGw==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/page.php b/tpl/page.php
index b8c343b0..66a814eb 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -47,7 +47,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-x8GMx3+kjkTYcs0woYYfMJuezva4bPJ4UasYido780GxFWcVEB9YnEvb5tvGoissx2Vdymvb6bg7hgdmUG+8Cg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-YW9b0ChcI/zuJwUZxdQW3zb/LO999he3fOtiio2MhickC7YyrzgvIcgvFMUYZjJ79tYiNzDLmMAZKRMvqoQoGw==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->