瀏覽代碼

Update pwstrength-bootstrap

jmontoyaa 8 年之前
父節點
當前提交
c96daa5449

+ 4 - 4
app/Resources/public/assets/pwstrength-bootstrap/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pwstrength-bootstrap",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "homepage": "https://github.com/ablanco/jquery.pwstrength.bootstrap",
   "authors": [
     "Alejandro Blanco <alejandro.b.e@gmail.com>"
@@ -35,11 +35,11 @@
     "Gruntfile.js",
     "package.json"
   ],
-  "_release": "2.0.3",
+  "_release": "2.0.6",
   "_resolution": {
     "type": "version",
-    "tag": "2.0.3",
-    "commit": "134e8360142c8be075011424ee3e22a9917ce99c"
+    "tag": "2.0.6",
+    "commit": "c44322209fa86f1c510f7a4b7b883f1e476e9dcc"
   },
   "_source": "https://github.com/ablanco/jquery.pwstrength.bootstrap.git",
   "_target": "*",

+ 1 - 1
app/Resources/public/assets/pwstrength-bootstrap/README.md

@@ -38,7 +38,7 @@ from this [repository](https://github.com/ablanco/jquery.pwstrength.bootstrap/tr
 Load it into your HTML after your original bootstrap and jQuery javascript files:
 
 ```html
-<script type="text/javascript" src="file/location/pwstrength-bootstrap-1.2.8.min.js"></script>
+<script type="text/javascript" src="dist/pwstrength-bootstrap.min.js"></script>
 ```
 
 Then just invoke the plugin on the password fields you want to attach a strength

+ 1 - 1
app/Resources/public/assets/pwstrength-bootstrap/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pwstrength-bootstrap",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "homepage": "https://github.com/ablanco/jquery.pwstrength.bootstrap",
   "authors": [
     "Alejandro Blanco <alejandro.b.e@gmail.com>"

+ 12 - 27
app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.js

@@ -1,6 +1,6 @@
 /*!
 * jQuery Password Strength plugin for Twitter Bootstrap
-* Version: 2.0.3
+* Version: 2.0.6
 *
 * Copyright (c) 2008-2013 Tane Piper
 * Copyright (c) 2013 Alejandro Blanco
@@ -60,7 +60,7 @@ try {
     if (!jQuery && module && module.exports) {
         var jQuery = require("jquery"),
             jsdom = require("jsdom").jsdom;
-        jQuery = jQuery(jsdom().parentWindow);
+        jQuery = jQuery(jsdom().defaultView);
     }
 } catch (ignore) {}
 
@@ -354,7 +354,7 @@ var ui = {};
     };
 
     ui.getUIElements = function (options, $el) {
-        var $container, selector, result;
+        var $container, result;
 
         if (options.instances.viewports) {
             return options.instances.viewports;
@@ -363,12 +363,7 @@ var ui = {};
         $container = ui.getContainer(options, $el);
 
         result = {};
-        if (options.ui.bootstrap4) {
-            selector = "progress.progress";
-        } else {
-            selector = "div.progress";
-        }
-        result.$progressbar = ui.findElement($container, options.ui.viewports.progress, selector);
+        result.$progressbar = ui.findElement($container, options.ui.viewports.progress, "div.progress");
         if (options.ui.showVerdictsInsideProgressBar) {
             result.$verdict = result.$progressbar.find("span.password-verdict");
         }
@@ -394,28 +389,18 @@ var ui = {};
             // Boostrap 2
             progressbar += options.ui.progressBarExtraCssClasses +
                 "'><div class='";
-        } else if (!options.ui.bootstrap2 && !options.ui.bootstrap4) {
-            // Bootstrap 3
+        } else {
+            // Bootstrap 3 & 4
             progressbar += "'><div class='" +
                 options.ui.progressBarExtraCssClasses + " progress-";
         }
         progressbar += "bar'>";
 
-        if (options.ui.bootstrap4) {
-            // Boostrap 4
-            progressbar = "<progress class='progress " +
-                options.ui.progressBarExtraCssClasses + "' value='0' max='100'>";
-        }
-
         if (options.ui.showVerdictsInsideProgressBar) {
             progressbar += "<span class='password-verdict'></span>";
         }
 
-        if (options.ui.bootstrap4) {
-            progressbar += "</progress>";
-        } else {
-            progressbar += "</div></div>";
-        }
+        progressbar += "</div></div>";
 
         if (options.ui.viewports.progress) {
             $container.find(options.ui.viewports.progress).append(progressbar);
@@ -487,18 +472,17 @@ var ui = {};
 
         $.each(options.ui.colorClasses, function (idx, value) {
             if (options.ui.bootstrap4) {
-                $progressbar.removeClass(cssPrefix + value);
+                $bar.removeClass("bg-" + value);
             } else {
                 $bar.removeClass(cssPrefix + "bar-" + value);
             }
         });
         if (options.ui.bootstrap4) {
-            $progressbar.addClass(cssPrefix + options.ui.colorClasses[cssClass]);
-            $progressbar.val(percentage);
+            $bar.addClass("bg-" + options.ui.colorClasses[cssClass]);
         } else {
             $bar.addClass(cssPrefix + "bar-" + options.ui.colorClasses[cssClass]);
-            $bar.css("width", percentage + '%');
         }
+        $bar.css("width", percentage + '%');
     };
 
     ui.updateVerdict = function (options, $el, cssClass, text) {
@@ -688,7 +672,8 @@ var methods = {};
                     if (value) { userInputs.push(value); }
                 });
                 userInputs = userInputs.concat(options.common.zxcvbnTerms);
-                score = Math.log2(zxcvbn(word, userInputs).guesses);
+                score = zxcvbn(word, userInputs).guesses;
+                score = Math.log(score) * Math.LOG2E;
             } else {
                 score = rulesEngine.executeRules(options, word);
             }

File diff suppressed because it is too large
+ 1 - 1
app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js


File diff suppressed because it is too large
+ 0 - 0
app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.min.map


+ 2 - 1
app/Resources/public/assets/pwstrength-bootstrap/src/methods.js

@@ -37,7 +37,8 @@ var methods = {};
                     if (value) { userInputs.push(value); }
                 });
                 userInputs = userInputs.concat(options.common.zxcvbnTerms);
-                score = Math.log2(zxcvbn(word, userInputs).guesses);
+                score = zxcvbn(word, userInputs).guesses;
+                score = Math.log(score) * Math.LOG2E;
             } else {
                 score = rulesEngine.executeRules(options, word);
             }

+ 1 - 1
app/Resources/public/assets/pwstrength-bootstrap/src/rules.js

@@ -15,7 +15,7 @@ try {
     if (!jQuery && module && module.exports) {
         var jQuery = require("jquery"),
             jsdom = require("jsdom").jsdom;
-        jQuery = jQuery(jsdom().parentWindow);
+        jQuery = jQuery(jsdom().defaultView);
     }
 } catch (ignore) {}
 

+ 8 - 24
app/Resources/public/assets/pwstrength-bootstrap/src/ui.js

@@ -37,7 +37,7 @@ var ui = {};
     };
 
     ui.getUIElements = function (options, $el) {
-        var $container, selector, result;
+        var $container, result;
 
         if (options.instances.viewports) {
             return options.instances.viewports;
@@ -46,12 +46,7 @@ var ui = {};
         $container = ui.getContainer(options, $el);
 
         result = {};
-        if (options.ui.bootstrap4) {
-            selector = "progress.progress";
-        } else {
-            selector = "div.progress";
-        }
-        result.$progressbar = ui.findElement($container, options.ui.viewports.progress, selector);
+        result.$progressbar = ui.findElement($container, options.ui.viewports.progress, "div.progress");
         if (options.ui.showVerdictsInsideProgressBar) {
             result.$verdict = result.$progressbar.find("span.password-verdict");
         }
@@ -77,28 +72,18 @@ var ui = {};
             // Boostrap 2
             progressbar += options.ui.progressBarExtraCssClasses +
                 "'><div class='";
-        } else if (!options.ui.bootstrap2 && !options.ui.bootstrap4) {
-            // Bootstrap 3
+        } else {
+            // Bootstrap 3 & 4
             progressbar += "'><div class='" +
                 options.ui.progressBarExtraCssClasses + " progress-";
         }
         progressbar += "bar'>";
 
-        if (options.ui.bootstrap4) {
-            // Boostrap 4
-            progressbar = "<progress class='progress " +
-                options.ui.progressBarExtraCssClasses + "' value='0' max='100'>";
-        }
-
         if (options.ui.showVerdictsInsideProgressBar) {
             progressbar += "<span class='password-verdict'></span>";
         }
 
-        if (options.ui.bootstrap4) {
-            progressbar += "</progress>";
-        } else {
-            progressbar += "</div></div>";
-        }
+        progressbar += "</div></div>";
 
         if (options.ui.viewports.progress) {
             $container.find(options.ui.viewports.progress).append(progressbar);
@@ -170,18 +155,17 @@ var ui = {};
 
         $.each(options.ui.colorClasses, function (idx, value) {
             if (options.ui.bootstrap4) {
-                $progressbar.removeClass(cssPrefix + value);
+                $bar.removeClass("bg-" + value);
             } else {
                 $bar.removeClass(cssPrefix + "bar-" + value);
             }
         });
         if (options.ui.bootstrap4) {
-            $progressbar.addClass(cssPrefix + options.ui.colorClasses[cssClass]);
-            $progressbar.val(percentage);
+            $bar.addClass("bg-" + options.ui.colorClasses[cssClass]);
         } else {
             $bar.addClass(cssPrefix + "bar-" + options.ui.colorClasses[cssClass]);
-            $bar.css("width", percentage + '%');
         }
+        $bar.css("width", percentage + '%');
     };
 
     ui.updateVerdict = function (options, $el, cssClass, text) {

Some files were not shown because too many files changed in this diff