Removed setting global Buffer (to ensure no Buffer dependency).

Author: ricmoo

index.html

@@ -62,7 +62,6 @@
             input[type=submit]:active {
                 background-color: #cfc;
                 color: #040;
-                
             }
 
             input[type=submit].cancel {
@@ -72,9 +71,8 @@
             input[type=submit]:active.cancel {
                 background-color: #fcc;
                 color: #400;
-                
             }
-    
+
             input {
                 margin-bottom: 30px;
             }
@@ -107,7 +105,7 @@
                 position: relative;
                 width: 100%;
             }
-            
+
             #progressBar {
                 background: #ccf;
                 border-radius: 15px;
@@ -136,10 +134,10 @@ <h1>scrypt-js</h1>
                 <div>
                     <div><b>Password</b> <span id="form-password" class="forms"><a class="form selected">UTF-8 (NFKC)</a><b>&bull;</b><a class="form">UTF-8 (NFKD)</a><b>&bull;</b><a class="form">hex</a></span></div>
                     <input id="pbkdf-password" type="text" value="password" />
-                    
+
                     <div><b>Salt</b> <span id="form-salt" class="forms"><a class="form selected">UTF-8 (NFKC)</a><b>&bull;</b><a class="form">UTF-8 (NFKD)</a><b>&bull;</b><a class="form">hex</a></span></div>
                     <input id="pbkdf-salt" type="text" value="salt" />
-                    
+
                     <div class="clearfix"></div>
                     <div>
                         <div class="param">
@@ -162,7 +160,7 @@ <h1>scrypt-js</h1>
                     <div class="clearfix"></div>
                     <input id="pbkdf-submit" type="submit" value="Compute scrypt" />
                     <div class="progress"><div id="progressBar"></div><div id="progressAmount">0%</div></div>
-                    <div id="result"></div>                    
+                    <div id="result"></div>
                 </div>
             </div>
         </div>
@@ -173,7 +171,6 @@ <h1>scrypt-js</h1>
         <script src="scrypt.js" type="text/javascript"></script>
 
         <script type="text/javascript">
-            window.Buffer = buffer.SlowBuffer;
 
             function get(id) { return document.getElementById(id); }
             function normalized(field) {
@@ -183,14 +180,14 @@ <h1>scrypt-js</h1>
                 var form = forms[0].innerHTML;
 
                 if (form.indexOf('NFKC') >= 0) {
-                    return new Buffer(value.normalize('NFKC'), 'utf8');
+                    return new buffer.SlowBuffer(value.normalize('NFKC'), 'utf8');
                 } else if (form.indexOf('NFKD') >= 0) {
-                    return new Buffer(value.normalize('NFKD'), 'utf8');
+                    return new buffer.SlowBuffer(value.normalize('NFKD'), 'utf8');
                 } else if (form.indexOf('hex') >= 0) {
                     if (!value.match(/^[0-9A-F][0-9A-F]$/i)) {
                         throw new Error(field + ': invalid hex string');
                     }
-                    return new Buffer(value, 'hex');
+                    return new buffer.SlowBuffer(value, 'hex');
                 }
 
                 throw new Error('Unknown ');
@@ -238,11 +235,11 @@ <h1>scrypt-js</h1>
                         var r = get('pbkdf-r').value;
                         var p = get('pbkdf-p').value;
                         var dkLen = get('pbkdf-dkLen').value;
-                        console.log(password, salt)
+                        console.log(password, salt, N, r, p)
 
                     } catch (error) {
                         printConsole(error.message);
-                        
+
                         done = null;
                         return;
                     }
@@ -260,7 +257,7 @@ <h1>scrypt-js</h1>
                             printConsole("Cancelled: " + parseInt(100 * progress) + "% done");
 
                         } else if (key) {
-                            key = new Buffer(key);
+                            key = new buffer.SlowBuffer(key);
                             printConsole("Generated: " + key.toString('hex'));
                             printConsole("Complete: " + (((new Date()).getTime() - t0) / 1000) + 's');
                         }
@@ -274,8 +271,8 @@ <h1>scrypt-js</h1>
 
                         } else if (done) {
                             return true;
-                        } 
-                        
+                        }
+
                         get('progressBar').style.width = parseInt(100 * progress) + '%';
                         get('progressAmount').innerHTML = parseInt(100 * progress) + '%';
                     });