Load zxcvbn on demand

Resolves #3515

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js
index 3207220db949a9318dd6fb54cab8135c8fd2e6e1..a3af899ece0a4d89679870b444e0d9d916d94e18 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js
@@ -7,7 +7,7 @@
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @module     WoltLabSuite/Core/Ui/User/PasswordStrength
  */
-define(['zxcvbn', 'Core', 'Language', 'StringUtil'], function (zxcvbn, Core, Language, StringUtil) {
+define(['Core', 'Language'], function (Core, Language) {
        'use strict';
        
        var STATIC_DICTIONARY = [];
@@ -25,17 +25,42 @@ define(['zxcvbn', 'Core', 'Language', 'StringUtil'], function (zxcvbn, Core, Lan
                return [].concat(value, value.split(/\W+/));
        }
        
+       function initializeFeedbacker(Feedback) {
+               var phrases = Core.extend({}, Feedback.default_phrases);
+               for (var type in phrases) {
+                       if (phrases.hasOwnProperty(type)) {
+                               for (var phrase in phrases[type]) {
+                                       if (phrases[type].hasOwnProperty(phrase)) {
+                                               var languageItem = 'wcf.user.password.zxcvbn.' + type + '.' + phrase;
+                                               var value = Language.get(languageItem);
+                                               if (value !== languageItem) {
+                                                       phrases[type][phrase] = value;
+                                               }
+                                       }
+                               }
+                       }
+               }
+               return new Feedback(phrases);
+       }
+       
        /**
         * @constructor
         */
-       function PasswordStrength(input, options) { this.init(input, options); }
+       function PasswordStrength(input, options) {
+               require(['zxcvbn']).then(function (modules) {
+                       var zxcvbn = modules[0];
+                       this.init(zxcvbn, input, options);
+               }.bind(this));
+       }
        
        PasswordStrength.prototype = {
                /**
-                * @param       {Element}       input
+                * @param       {*}             zxcvbn
+                * @param       {Element}       input
                 * @param       {object}        options
                 */
-               init: function (input, options) {
+               init: function (zxcvbn, input, options) {
+                       this._zxcvbn = zxcvbn;
                        this._input = input;
                        
                        this._options = Core.extend({
@@ -44,21 +69,7 @@ define(['zxcvbn', 'Core', 'Language', 'StringUtil'], function (zxcvbn, Core, Lan
                        }, options);
                        
                        if (!this._options.feedbacker) {
-                               var phrases = Core.extend({}, zxcvbn.Feedback.default_phrases);
-                               for (var type in phrases) {
-                                       if (phrases.hasOwnProperty(type)) {
-                                               for (var phrase in phrases[type]) {
-                                                       if (phrases[type].hasOwnProperty(phrase)) {
-                                                               var languageItem = 'wcf.user.password.zxcvbn.' + type + '.' + phrase;
-                                                               var value = Language.get(languageItem);
-                                                               if (value !== languageItem) {
-                                                                       phrases[type][phrase] = value;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                               this._options.feedbacker = new zxcvbn.Feedback(phrases);
+                               this._options.feedbacker = initializeFeedbacker(zxcvbn.Feedback);
                        }
                        
                        this._wrapper = elCreate('div');
@@ -119,7 +130,7 @@ define(['zxcvbn', 'Core', 'Language', 'StringUtil'], function (zxcvbn, Core, Lan
                        
                        // To bound runtime latency for really long passwords, consider sending zxcvbn() only
                        // the first 100 characters or so of user input.
-                       var verdict = zxcvbn(value.substr(0, 100), dictionary);
+                       var verdict = this._zxcvbn(value.substr(0, 100), dictionary);
                        verdict.feedback = this._options.feedbacker.from_result(verdict);
                        
                        elData(this._score, 'score', value.length === 0 ? '-1' : verdict.score);