<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25884] trunk/src/wp-admin/js/about.js: About page: Cache our zxcvbn calls and limit the variation of the animation.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25884">25884</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-23 19:50:30 +0000 (Wed, 23 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>About page: Cache our zxcvbn calls and limit the variation of the animation.
Diff is mostly whitespace.
props jorbin, azaozz.
fixes <a href="http://core.trac.wordpress.org/ticket/25603">#25603</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsaboutjs">trunk/src/wp-admin/js/about.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsaboutjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/about.js (25883 => 25884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/about.js 2013-10-23 19:47:39 UTC (rev 25883)
+++ trunk/src/wp-admin/js/about.js 2013-10-23 19:50:30 UTC (rev 25884)
</span><span class="lines">@@ -1,66 +1,80 @@
</span><span class="cx"> (function($){
</span><del>- var password = 'Gosh, WordPress is grand.',
- $input = $('#pass'),
- shouldAnimate = true,
- indicatorString = $('#pass-strength-result').text();
</del><ins>+ var password = 'Gosh, WordPress is grand.',
+ $input = $('#pass'),
+ shouldAnimate = true,
+ timesForAnimation = [280, 300, 305, 310, 315, 325, 330, 345, 360, 370, 380, 400, 450, 500, 600],
+ resultsCache = {},
+ indicatorString = $('#pass-strength-result').text();
</ins><span class="cx">
</span><del>- function updateResult(){
- var strength = wp.passwordStrength.meter($input.val(), [], $input.val());
</del><ins>+ function updateResult(){
+ var strength;
</ins><span class="cx">
</span><del>- $('#pass-strength-result').removeClass('short bad good strong');
- switch ( strength ) {
- case 2:
- $('#pass-strength-result').addClass('bad').html( pwsL10n['bad'] );
- break;
- case 3:
- $('#pass-strength-result').addClass('good').html( pwsL10n['good'] );
- break;
- case 4:
- $('#pass-strength-result').addClass('strong').html( pwsL10n['strong'] );
- break;
- default:
- $('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
- }
- }
- function resetMeter(){
- $input.val('');
- $('#pass-strength-result').text(indicatorString);
- $('#pass-strength-result').removeClass('short bad good strong');
- }
</del><ins>+ if ( typeof( resultsCache[ $input.val() ]) === 'undefined') {
+ strength = wp.passwordStrength.meter($input.val(), [], $input.val());
+ resultsCache[ $input.val() ] = strength;
+ } else {
+ strength = resultsCache[ $input.val() ];
+ }
</ins><span class="cx">
</span><del>- function animate(){
- if (shouldAnimate === false)
- return;
- if ($input.val().length < password.length){
- $input.val( password.substr(0, $input.val().length + 1) );
- updateResult();
- } else {
- resetMeter();
- }
- // Look like real typing by changing the speed new letters are added each time
- setTimeout(animate, 220 + Math.floor(Math.random() * ( 800 - 220)) );
- }
- //
- function begin(){
- // we async load zxcvbn, so we need to make sure it's loaded before starting
- if (typeof(zxcvbn) !== 'undefined')
- animate();
- else
- setTimeout(begin,800);
- }
</del><ins>+ $('#pass-strength-result').removeClass('short bad good strong');
+ switch ( strength ) {
+ case 2:
+ $('#pass-strength-result').addClass('bad').html( pwsL10n['bad'] );
+ break;
+ case 3:
+ $('#pass-strength-result').addClass('good').html( pwsL10n['good'] );
+ break;
+ case 4:
+ $('#pass-strength-result').addClass('strong').html( pwsL10n['strong'] );
+ break;
+ default:
+ $('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
+ }
+ }
+ function resetMeter(){
+ $input.val('');
+ $('#pass-strength-result').text(indicatorString);
+ $('#pass-strength-result').removeClass('short bad good strong');
+ }
</ins><span class="cx">
</span><del>- // Turn off the animation on focus
- $input.on('focus', function(){
- shouldAnimate = false;
- resetMeter();
- });
</del><ins>+ function animate(){
+ if (shouldAnimate === false)
+ return;
+ if ($input.val().length < password.length){
+ $input.val( password.substr(0, $input.val().length + 1) );
+ updateResult();
</ins><span class="cx">
</span><del>- // Act like a normal password strength meter
- $input.on('keyup', function(){
- updateResult();
- });
</del><ins>+ // Look like real typing by changing the speed new letters are added each time
+ setTimeout( animate, ( timesForAnimation[ Math.floor( Math.random() * timesForAnimation.length ) ] ) );
+ } else {
+ resetMeter();
</ins><span class="cx">
</span><del>- // Start the animation
- begin();
</del><ins>+ // When we reset, let's wait a bit longer than normal to start again
+ setTimeout(animate, 700);
+ }
</ins><span class="cx">
</span><ins>+ }
+
+ function begin(){
+ // we async load zxcvbn, so we need to make sure it's loaded before starting
+ if (typeof(zxcvbn) !== 'undefined')
+ animate();
+ else
+ setTimeout(begin,800);
+ }
+
+ // Turn off the animation on focus
+ $input.on('focus', function(){
+ shouldAnimate = false;
+ resetMeter();
+ });
+
+ // Act like a normal password strength meter
+ $input.on('keyup', function(){
+ updateResult();
+ });
+
+ // Start the animation
+ begin();
+
</ins><span class="cx"> })(jQuery);
</span></span></pre>
</div>
</div>
</body>
</html>