Updated demo page.

Author: ricmoo

index.html

@@ -173,6 +173,11 @@ <h1>scrypt-js</h1>
         <script type="text/javascript">
 
             function get(id) { return document.getElementById(id); }
+            function getValue(id) {
+                var value = get(id).value;
+                if (value.match(/^[0-9]+$/)) { return parseInt(value); }
+                return null;
+            }
             function normalized(field) {
                 var value = get('pbkdf-' + field).value;
                 var forms = document.getElementById('form-' + field).getElementsByClassName('selected');
@@ -229,12 +234,12 @@ <h1>scrypt-js</h1>
                     done = false;
 
                     try {
-                        var password = normalized('password'); //get('pbkdf-password').value;
-                        var salt = normalized('salt');// get('pbkdf-salt').value;
-                        var N = 1 << parseInt(get('pbkdf-Nlog2').value);
-                        var r = get('pbkdf-r').value;
-                        var p = get('pbkdf-p').value;
-                        var dkLen = get('pbkdf-dkLen').value;
+                        var password = normalized('password');
+                        var salt = normalized('salt');
+                        var N = 1 << getValue('pbkdf-Nlog2');
+                        var r = getValue('pbkdf-r');
+                        var p = getValue('pbkdf-p');
+                        var dkLen = getValue('pbkdf-dkLen');
                         console.log(password, salt, N, r, p)
 
                     } catch (error) {
@@ -251,30 +256,30 @@ <h1>scrypt-js</h1>
                         ', password=0x' + password.toString('hex') + ', salt=0x' + salt.toString('hex'));
 
                     var t0 = (new Date()).getTime();
-                    scrypt(password, salt, N, r, p, dkLen, function(error, progress, key) {
-
-                        if (error) {
-                            printConsole("Cancelled: " + parseInt(100 * progress) + "% done");
-
-                        } else if (key) {
-                            key = new buffer.SlowBuffer(key);
-                            printConsole("Generated: " + key.toString('hex'));
-                            printConsole("Complete: " + (((new Date()).getTime() - t0) / 1000) + 's');
-                        }
-
-                        if (error || key) {
-                            submit.classList.remove('cancel');
-                            submit.value = "Compute scrypt";
-
-                            done = null;
-                            progress = 0;
-
-                        } else if (done) {
-                            return true;
-                        }
+                    scrypt.scrypt(password, salt, N, r, p, dkLen, function(progress) {
+                        // Cancelled
+                        if (done) { return true; }
 
+                        // Update the progress bar
                         get('progressBar').style.width = parseInt(100 * progress) + '%';
                         get('progressAmount').innerHTML = parseInt(100 * progress) + '%';
+                    }).then(function(key) {
+                        key = new buffer.SlowBuffer(key);
+                        printConsole("Generated: " + key.toString('hex'));
+                        printConsole("Complete: " + (((new Date()).getTime() - t0) / 1000) + 's');
+                    }, function(error) {
+                        if (error.message === "cancelled") {
+                            printConsole("Cancelled!");
+                        } else {
+                            printConsole("Error: " + error.message);
+                        }
+                    }).then(function() {
+                        submit.classList.remove('cancel');
+                        submit.value = "Compute scrypt";
+
+                        done = null;
+                        get('progressBar').style.width = '0%';
+                        get('progressAmount').innerHTML = '0%';
                     });
 
                 } else if (done === false) {