Update strengthify to 0.5.1

This commit is contained in:
Morris Jobke 2016-06-15 15:20:21 +02:00
parent fff42812c7
commit 957d35f590
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
3 changed files with 193 additions and 104 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "strengthify", "name": "strengthify",
"version": "0.4.2", "version": "0.5.1",
"homepage": "https://github.com/MorrisJobke/strengthify", "homepage": "https://github.com/MorrisJobke/strengthify",
"authors": [ "authors": [
"Morris Jobke <hey@morrisjobke.de>" "Morris Jobke <hey@morrisjobke.de>"
@ -8,13 +8,13 @@
"description": "Combine jQuery and zxcvbn to create a password strength meter.", "description": "Combine jQuery and zxcvbn to create a password strength meter.",
"main": "jquery.strengthify.js", "main": "jquery.strengthify.js",
"license": "MIT", "license": "MIT",
"_release": "0.4.2", "_release": "0.5.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v0.4.2", "tag": "0.5.1",
"commit": "b3df9344d829063564cdced3c6328b001bc4bad1" "commit": "fd8bc41992bb37e16495a8e4c266951b93f8467d"
}, },
"_source": "git://github.com/MorrisJobke/strengthify.git", "_source": "git://github.com/MorrisJobke/strengthify.git",
"_target": "0.4.2", "_target": "0.5.1",
"_originalSource": "strengthify" "_originalSource": "strengthify"
} }

View File

@ -2,14 +2,16 @@
* Strengthify - show the weakness of a password (uses zxcvbn for this) * Strengthify - show the weakness of a password (uses zxcvbn for this)
* https://github.com/MorrisJobke/strengthify * https://github.com/MorrisJobke/strengthify
* *
* Version: 0.4.2 * Version: 0.5.1
* Author: Morris Jobke (github.com/MorrisJobke) * Author: Morris Jobke (github.com/MorrisJobke) - original
* Eve Ragins @ Eve Corp (github.com/eve-corp)
*
* *
* License: * License:
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2013-2015 Morris Jobke <morris.jobke@gmail.com> * Copyright (c) 2013-2016 Morris Jobke <morris.jobke@gmail.com>
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of * 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 * this software and associated documentation files (the "Software"), to deal in
@ -30,10 +32,11 @@
*/ */
/* global jQuery */ /* global jQuery */
(function ($) { (function($) {
$.fn.strengthify = function(paramOptions) { $.fn.strengthify = function(paramOptions) {
var me = this, "use strict";
defaults = {
var defaults = {
zxcvbn: 'zxcvbn/zxcvbn.js', zxcvbn: 'zxcvbn/zxcvbn.js',
titles: [ titles: [
'Weakest', 'Weakest',
@ -41,44 +44,87 @@
'So-so', 'So-so',
'Good', 'Good',
'Perfect' 'Perfect'
] ],
tilesOptions:{
tooltip: true,
element: false
}, },
options = $.extend(defaults, paramOptions), drawTitles: false,
drawStrengthify = function() { drawMessage: false,
var password = $(me).val(), drawBars: true
// hide strengthigy if no input is provided };
return this.each(function() {
var options = $.extend(defaults, paramOptions);
if (!options.drawTitles
&& !options.drawMessage
&& !options.drawBars)
console.warn("expect at least one of 'drawTitles', 'drawMessage', or 'drawBars' to be true");
function getWrapperFor(id) {
return $('div[data-strengthifyFor="' + id + '"]');
};
function drawStrengthify() {
var password = $(this).val(),
elemId = $(this).attr('id'),
// hide strengthify if no input is provided
opacity = (password === '') ? 0 : 1, opacity = (password === '') ? 0 : 1,
// calculate result // calculate result
result = zxcvbn(password), result = zxcvbn(password),
// setup some vars for later
css = '', css = '',
bsLevel = '',
message = '',
// cache jQuery selections // cache jQuery selections
$container = $('.strengthify-container'), $wrapper = getWrapperFor(elemId),
$wrapper = $('.strengthify-wrapper'); $container = $wrapper.find('.strengthify-container'),
$message = $wrapper.find('[data-strengthifyMessage]');
$wrapper.children().css(
'opacity', $wrapper.children()
opacity .css('opacity', opacity)
).css( .css('-ms-filter',
'-ms-filter',
'"progid:DXImageTransform.Microsoft.Alpha(Opacity=' + opacity * 100 + ')"' '"progid:DXImageTransform.Microsoft.Alpha(Opacity=' + opacity * 100 + ')"'
); );
// style strengthify bar // style strengthify bar
// possible scores: 0-4 // possible scores: 0-4
switch(result.score) { switch (result.score) {
case 0: case 0:
case 1: case 1:
css = 'password-bad'; css = 'password-bad';
bsLevel = 'danger';
message = result.feedback ? result.feedback.suggestions.join('<br/>') : "";
break; break;
case 2: case 2:
bsLevel = 'warning';
message = result.feedback ? result.feedback.suggestions.join('<br/>') : "";
css = 'password-medium'; css = 'password-medium';
break; break;
case 3: case 3:
css = 'password-good';
bsLevel = 'info';
message = "Getting better.";
case 4: case 4:
css = 'password-good'; css = 'password-good';
bsLevel = 'success';
message = "Looks good.";
break; break;
} }
if ($message) {
$message.removeAttr('class');
$message.addClass('bg-' + bsLevel);
// reset state for empty string password
if (password === '') {
message = '';
}
$message.html(message);
}
if ($container) {
$container $container
.attr('class', css + ' strengthify-container') .attr('class', css + ' strengthify-container')
// possible scores: 0-4 // possible scores: 0-4
@ -89,7 +135,15 @@
((result.score === 0 ? 1 : result.score) * 25) + '%' ((result.score === 0 ? 1 : result.score) * 25) + '%'
); );
// reset state for empty string password
if (password === '') {
$container.css('width', 0);
}
}
if (options.drawTitles) {
// set a title for the wrapper // set a title for the wrapper
if(options.tilesOptions.tooltip){
$wrapper.attr( $wrapper.attr(
'title', 'title',
options.titles[result.score] options.titles[result.score]
@ -97,41 +151,64 @@
placement: 'bottom', placement: 'bottom',
trigger: 'manual', trigger: 'manual',
}).tooltip( }).tooltip(
'fixTitle'
).tooltip(
'show' 'show'
); );
if(opacity === 0) { if (opacity === 0) {
$wrapper.tooltip( $wrapper.tooltip(
'hide' 'hide'
); );
} }
// reset state for empty string password
if(password === '') {
$container.css('width', 0);
} }
if(options.tilesOptions.element){
$wrapper.find(".strengthify-tiles").text(options.titles[result.score]);
}
}
}; };
function init() {
var $elem = $(this),
elemId = $elem.attr('id');
var drawSelf = drawStrengthify.bind(this);
// add elements // add elements
$('.strengthify-wrapper') $elem.after('<div class="strengthify-wrapper" data-strengthifyFor="' + $elem.attr('id') + '"></div>');
if (options.drawBars) {
getWrapperFor(elemId)
.append('<div class="strengthify-bg" />') .append('<div class="strengthify-bg" />')
.append('<div class="strengthify-container" />') .append('<div class="strengthify-container" />')
.append('<div class="strengthify-separator" style="left: 25%" />') .append('<div class="strengthify-separator" style="left: 25%" />')
.append('<div class="strengthify-separator" style="left: 50%" />') .append('<div class="strengthify-separator" style="left: 50%" />')
.append('<div class="strengthify-separator" style="left: 75%" />'); .append('<div class="strengthify-separator" style="left: 75%" />');
}
me.parents().on('scroll', drawStrengthify); if (options.drawMessage) {
getWrapperFor(elemId).append('<div data-strengthifyMessage></div>');
}
if (options.drawTitles && options.tilesOptions) {
getWrapperFor(elemId).append('<div class="strengthify-tiles"></div>');
}
$elem.parent().on('scroll', drawSelf);
$.ajax({ $.ajax({
cache: true, cache: true,
dataType: 'script', dataType: 'script',
url: options.zxcvbn url: options.zxcvbn
}).done(function() { }).done(function() {
me.bind('keyup input change', drawStrengthify); $elem.bind('keyup input change', drawSelf);
}); });
return me;
}; };
}(jQuery)); init.call(this);
//return me;
});
};
} (jQuery));

View File

@ -1,11 +1,15 @@
/** /**
* Strengthify - show the weakness of a password (uses zxcvbn for this) * Strengthify - show the weakness of a password (uses zxcvbn for this)
* https://github.com/MorrisJobke/strengthify * https://github.com/MorrisJobke/strengthify
* Version: 0.4.2 * Version: 0.5.1
* License: The MIT License (MIT) * License: The MIT License (MIT)
* Copyright (c) 2013 Morris Jobke <morris.jobke@gmail.com> * Copyright (c) 2013-2016 Morris Jobke <morris.jobke@gmail.com>
*/ */
.strengthify-wrapper {
position: relative;
}
.strengthify-wrapper > * { .strengthify-wrapper > * {
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
filter: alpha(opacity=0); filter: alpha(opacity=0);
@ -15,7 +19,7 @@
transition:all .5s ease-in-out; transition:all .5s ease-in-out;
} }
.strengthify-bg, .strengthify-container, .strengthify-wrapper, .strengthify-separator { .strengthify-bg, .strengthify-container, .strengthify-separator {
height: 3px; height: 3px;
} }
@ -46,3 +50,11 @@
.password-good { .password-good {
background-color: #3C3; background-color: #3C3;
} }
div[data-strengthifyMessage] {
padding: 3px 8px;
}
.strengthify-tiles{
float: right;
}