diff --git a/composer.json b/composer.json
index 1a80bc5f..b92f4629 100644
--- a/composer.json
+++ b/composer.json
@@ -18,9 +18,9 @@
}
],
"require": {
- "php": "^5.2.6 || ^7.0",
- "paragonie/random_compat": "^2.0",
- "yzalis/identicon": "^1.1"
+ "php": "^5.3.0 || ^7.0",
+ "paragonie/random_compat": "2.0.4",
+ "yzalis/identicon": "1.1.0"
},
"require-dev": {
"codacy/coverage": "dev-master",
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):
-
+
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):
-
+
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 1bddfbd3..26f0cedc 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -7,5 +7,4 @@ $baseDir = dirname($vendorDir);
return array(
'PrivateBin\\' => array($baseDir . '/lib'),
- 'CodeClimate\\PhpTestReporter\\' => array($vendorDir . '/codeclimate/php-test-reporter/src'),
);
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 81b8716e..001a248f 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -15,10 +15,6 @@ class ComposerStaticInitDontChange
array (
'PrivateBin\\' => 11,
),
- 'C' =>
- array (
- 'CodeClimate\\PhpTestReporter\\' => 28,
- ),
);
public static $prefixDirsPsr4 = array (
@@ -26,10 +22,6 @@ class ComposerStaticInitDontChange
array (
0 => __DIR__ . '/../..' . '/lib',
),
- 'CodeClimate\\PhpTestReporter\\' =>
- array (
- 0 => __DIR__ . '/..' . '/codeclimate/php-test-reporter/src',
- ),
);
public static $prefixesPsr0 = array (