diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-26 15:10:04 -0600 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-03-27 10:06:30 -0600 |
| commit | afcb41886ecaf3b05a21f4379f6386fba5ff7954 (patch) | |
| tree | 1f2b74aed6e87def4ecfec8b46a9fbcb503211b3 | |
| parent | 0037d18aeeaa9ab4bc8ef6a110ca9f410eae9222 (diff) | |
| download | nextcloud-server-afcb41886ecaf3b05a21f4379f6386fba5ff7954.tar.gz nextcloud-server-afcb41886ecaf3b05a21f4379f6386fba5ff7954.zip | |
Update strengthify and fix password strength
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | bower.json | 2 | ||||
| -rw-r--r-- | core/vendor/.gitignore | 4 | ||||
| -rw-r--r-- | core/vendor/strengthify/.bower.json | 10 | ||||
| -rw-r--r-- | core/vendor/strengthify/jquery.strengthify.js | 7 | ||||
| -rw-r--r-- | core/vendor/strengthify/strengthify.css | 2 |
5 files changed, 15 insertions, 10 deletions
diff --git a/bower.json b/bower.json index 6a64e184b07..72f525f985c 100644 --- a/bower.json +++ b/bower.json @@ -25,7 +25,7 @@ "select2": "~3.4.8", "zxcvbn": "*", "snapjs": "~2.0.0-rc1", - "strengthify": "^0.5.1", + "strengthify": "^0.5.2", "underscore": "~1.8.0", "bootstrap": "~3.3.6", "backbone": "~1.2.3", diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore index 457fb29eb99..f6eac907f34 100644 --- a/core/vendor/.gitignore +++ b/core/vendor/.gitignore @@ -172,3 +172,7 @@ DOMPurify/** !DOMPurify/dist/purify.min.js !DOMPurify/.bower.json !DOMPurify/LICENSE + +# strengthify +strengthify/examples.html +strengthify/examples.png diff --git a/core/vendor/strengthify/.bower.json b/core/vendor/strengthify/.bower.json index ad06b8656a6..9a5973c3116 100644 --- a/core/vendor/strengthify/.bower.json +++ b/core/vendor/strengthify/.bower.json @@ -1,6 +1,6 @@ { "name": "strengthify", - "version": "0.5.1", + "version": "0.5.2", "homepage": "https://github.com/MorrisJobke/strengthify", "authors": [ "Eve Ragins <eve.ragins@eve-corp.com", @@ -9,13 +9,13 @@ "description": "Combine jQuery and zxcvbn to create a password strength meter.", "main": "jquery.strengthify.js", "license": "MIT", - "_release": "0.5.1", + "_release": "0.5.2", "_resolution": { "type": "version", - "tag": "0.5.1", - "commit": "fd8bc41992bb37e16495a8e4c266951b93f8467d" + "tag": "0.5.2", + "commit": "82d63c39de1b7b60ae38d24d0f866cba325904b5" }, "_source": "https://github.com/MorrisJobke/strengthify.git", - "_target": "^0.5.1", + "_target": "^0.5.2", "_originalSource": "strengthify" }
\ No newline at end of file diff --git a/core/vendor/strengthify/jquery.strengthify.js b/core/vendor/strengthify/jquery.strengthify.js index 1019aab2976..046c2150210 100644 --- a/core/vendor/strengthify/jquery.strengthify.js +++ b/core/vendor/strengthify/jquery.strengthify.js @@ -2,7 +2,7 @@ * Strengthify - show the weakness of a password (uses zxcvbn for this) * https://github.com/MorrisJobke/strengthify * - * Version: 0.5.1 + * Version: 0.5.2 * Author: Morris Jobke (github.com/MorrisJobke) - original * Eve Ragins @ Eve Corp (github.com/eve-corp) * @@ -107,6 +107,7 @@ css = 'password-good'; bsLevel = 'info'; message = "Getting better."; + break; case 4: css = 'password-good'; bsLevel = 'success'; @@ -198,9 +199,9 @@ $.ajax({ cache: true, - dataType: 'script', url: options.zxcvbn - }).done(function() { + }).done(function(content) { + eval(content); $elem.bind('keyup input change', drawSelf); }); }; diff --git a/core/vendor/strengthify/strengthify.css b/core/vendor/strengthify/strengthify.css index e8486fb0881..bacdd541eaa 100644 --- a/core/vendor/strengthify/strengthify.css +++ b/core/vendor/strengthify/strengthify.css @@ -1,7 +1,7 @@ /** * Strengthify - show the weakness of a password (uses zxcvbn for this) * https://github.com/MorrisJobke/strengthify - * Version: 0.5.1 + * Version: 0.5.2 * License: The MIT License (MIT) * Copyright (c) 2013-2016 Morris Jobke <morris.jobke@gmail.com> */ |