aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-11-16 11:16:38 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-11-16 11:16:38 +0100
commitb1abef77e484adb5417f5b662cda79fca69426c1 (patch)
tree3e5a21471a31f15f64fab5401a4cc25a56014084
parent1e9203cdef7009ef129f0f3e3db6a326d3f4db12 (diff)
downloadnextcloud-server-b1abef77e484adb5417f5b662cda79fca69426c1.tar.gz
nextcloud-server-b1abef77e484adb5417f5b662cda79fca69426c1.zip
Update strengthify to 0.4.2
* includes local changes (ported them to upstream - see #10625) * tipsy -> tooltip * re-renders the element on scroll of a parent - fixes #20454
-rw-r--r--bower.json2
-rw-r--r--core/vendor/strengthify/.bower.json10
-rw-r--r--core/vendor/strengthify/LICENSE2
-rw-r--r--core/vendor/strengthify/jquery.strengthify.js55
-rw-r--r--core/vendor/strengthify/strengthify.css6
5 files changed, 39 insertions, 36 deletions
diff --git a/bower.json b/bower.json
index 1fe270d9f3c..e8bb9a35f32 100644
--- a/bower.json
+++ b/bower.json
@@ -24,7 +24,7 @@
"select2": "~3.4.8",
"zxcvbn": "*",
"snapjs": "~2.0.0-rc1",
- "strengthify": "0.4.1",
+ "strengthify": "0.4.2",
"underscore": "~1.8.0",
"bootstrap": "~3.3.5",
"backbone": "~1.2.1"
diff --git a/core/vendor/strengthify/.bower.json b/core/vendor/strengthify/.bower.json
index b86b43f17b7..d0baec6ed73 100644
--- a/core/vendor/strengthify/.bower.json
+++ b/core/vendor/strengthify/.bower.json
@@ -1,6 +1,6 @@
{
"name": "strengthify",
- "version": "0.4.1",
+ "version": "0.4.2",
"homepage": "https://github.com/MorrisJobke/strengthify",
"authors": [
"Morris Jobke <hey@morrisjobke.de>"
@@ -8,13 +8,13 @@
"description": "Combine jQuery and zxcvbn to create a password strength meter.",
"main": "jquery.strengthify.js",
"license": "MIT",
- "_release": "0.4.1",
+ "_release": "0.4.2",
"_resolution": {
"type": "version",
- "tag": "0.4.1",
- "commit": "fe9d1c80156d3fcdd16434ebc789007d045c1d1f"
+ "tag": "v0.4.2",
+ "commit": "b3df9344d829063564cdced3c6328b001bc4bad1"
},
"_source": "git://github.com/MorrisJobke/strengthify.git",
- "_target": "0.4.1",
+ "_target": "0.4.2",
"_originalSource": "strengthify"
} \ No newline at end of file
diff --git a/core/vendor/strengthify/LICENSE b/core/vendor/strengthify/LICENSE
index 3c04738f789..b249b595978 100644
--- a/core/vendor/strengthify/LICENSE
+++ b/core/vendor/strengthify/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2013 Morris Jobke
+Copyright (c) 2013-2015 Morris Jobke
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/core/vendor/strengthify/jquery.strengthify.js b/core/vendor/strengthify/jquery.strengthify.js
index 4fcc4d7c7c4..26d06a5d301 100644
--- a/core/vendor/strengthify/jquery.strengthify.js
+++ b/core/vendor/strengthify/jquery.strengthify.js
@@ -1,15 +1,15 @@
/**
* Strengthify - show the weakness of a password (uses zxcvbn for this)
- * https://github.com/kabum/strengthify
+ * https://github.com/MorrisJobke/strengthify
*
- * Version: 0.4.1
- * Author: Morris Jobke (github.com/kabum)
+ * Version: 0.4.2
+ * Author: Morris Jobke (github.com/MorrisJobke)
*
* License:
*
* The MIT License (MIT)
*
- * Copyright (c) 2013 Morris Jobke <morris.jobke@gmail.com>
+ * Copyright (c) 2013-2015 Morris Jobke <morris.jobke@gmail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
@@ -43,23 +43,9 @@
'Perfect'
]
},
- options = $.extend(defaults, paramOptions);
-
- // add elements
- $('.strengthify-wrapper')
- .append('<div class="strengthify-bg" />')
- .append('<div class="strengthify-container" />')
- .append('<div class="strengthify-separator" style="left: 25%" />')
- .append('<div class="strengthify-separator" style="left: 50%" />')
- .append('<div class="strengthify-separator" style="left: 75%" />');
-
- $.ajax({
- cache: true,
- dataType: 'script',
- url: options.zxcvbn
- }).done(function() {
- me.bind('keyup input change', function() {
- var password = $(this).val(),
+ options = $.extend(defaults, paramOptions),
+ drawStrengthify = function() {
+ var password = $(me).val(),
// hide strengthigy if no input is provided
opacity = (password === '') ? 0 : 1,
// calculate result
@@ -107,15 +93,15 @@
$wrapper.attr(
'title',
options.titles[result.score]
- ).tipsy({
+ ).tooltip({
+ placement: 'bottom',
trigger: 'manual',
- opacity: opacity
- }).tipsy(
+ }).tooltip(
'show'
);
if(opacity === 0) {
- $wrapper.tipsy(
+ $wrapper.tooltip(
'hide'
);
}
@@ -125,7 +111,24 @@
$container.css('width', 0);
}
- });
+ };
+
+ // add elements
+ $('.strengthify-wrapper')
+ .append('<div class="strengthify-bg" />')
+ .append('<div class="strengthify-container" />')
+ .append('<div class="strengthify-separator" style="left: 25%" />')
+ .append('<div class="strengthify-separator" style="left: 50%" />')
+ .append('<div class="strengthify-separator" style="left: 75%" />');
+
+ me.parents().on('scroll', drawStrengthify);
+
+ $.ajax({
+ cache: true,
+ dataType: 'script',
+ url: options.zxcvbn
+ }).done(function() {
+ me.bind('keyup input change', drawStrengthify);
});
return me;
diff --git a/core/vendor/strengthify/strengthify.css b/core/vendor/strengthify/strengthify.css
index 9340270ecfb..5555cbdf334 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/kabum/strengthify
- * Version: 0.3
+ * https://github.com/MorrisJobke/strengthify
+ * Version: 0.4.2
* License: The MIT License (MIT)
* Copyright (c) 2013 Morris Jobke <morris.jobke@gmail.com>
*/
@@ -45,4 +45,4 @@
}
.password-good {
background-color: #3C3;
-} \ No newline at end of file
+}