From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/js/scrigo.js.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 7ba19d1..4277b9d 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -133,7 +133,7 @@
} else {
width = points*20;
}
- document.getElementById("passBar").innerHTML = '<div style="float:left; height: 10px; padding:0px; background-color: ' + pass_messages[points]['color'] + '; width: ' + width + 'px;" />';
+ document.getElementById("passBar").innerHTML = '<div style="background-color: ' + pass_messages[points]['color'] + '; width: ' + width + 'px;" />';
document.getElementById("passText").innerHTML = pass_messages[points]['text'];
}
function pass_contains(pass, check) {
@@ -153,9 +153,9 @@
var maxLength = minLength + 5;
var length = getRandomInt(minLength, maxLength);
- var alphachars = "abcdefghijklmnopqrstuvwxyz";
- var upperchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- var numchars = "1234567890";
+ var alphachars = "abcdefghijkmnopqrstuvwxyz";
+ var upperchars = "ABCDEFGHJKLMNPQRSTUVWXYZ";
+ var numchars = "23456789";
var specialchars = "!@#_";
if(num_special == undefined) num_special = 0;
@@ -204,6 +204,12 @@
var pword = password(<?php echo $min_password_length; ?>, false, 1);
jQuery('#'+repeatPasswordFieldID).val(pword);
newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup').select();
+ newPWField.unbind('keyup').on('keyup', function(e) {
+ if($(this).val() != pword) {
+ var pos = $(this).getCursorPosition();
+ $(this).attr('type', 'password').unbind('keyup').setCursorPosition(pos);
+ }
+ });
}
var funcDisableClick = function(e) { e.preventDefault(); return false; };
--
Gitblit v1.9.1