Merge branch 'hotfix/3.0.0'

[rbdr/r.bdr.sh] / jekyll / js / unlimited_pizza / pepperoni.js

diff --git a/jekyll/js/unlimited_pizza/pepperoni.js b/jekyll/js/unlimited_pizza/pepperoni.js
index 9bb27a2167bce4a52e3910f28ea14dc0539bb703..12dca9dd007cd1a245342c28452248a4d9c7b587 100644 (file)
--- a/jekyll/js/unlimited_pizza/pepperoni.js
+++ b/jekyll/js/unlimited_pizza/pepperoni.js
@@ -2,13 +2,13 @@
 
 Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
   INNER_HTML : ' \
 
 Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
   INNER_HTML : ' \

-<a class="record-button">&#11044</a> \
+<a class="record-button">Record.</a> \

 <div class="record-info"> \
   <div class="record-progress"> \
     <div class="record-progress-bar-container"> \
       <div class="record-progress-bar"></div> \
     </div> \
 <div class="record-info"> \
   <div class="record-progress"> \
     <div class="record-progress-bar-container"> \
       <div class="record-progress-bar"></div> \
     </div> \

-    <a class="record-clear">X</a> \
+    <a class="record-clear">Clear recording.</a> \

   </div> \
   <audio class="record-preview" controls></audio> \
   <div class="filter-switches"> \
   </div> \
   <audio class="record-preview" controls></audio> \
   <div class="filter-switches"> \


@@ -20,8 +20,8 @@ Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
   </div> \
 </div> \
   ',
   </div> \
 </div> \
   ',

-  PAUSE : '&#9616;&#9616;',
-  RECORD : '&#11044;',
+  PAUSE : 'Pause.',
+  RECORD : 'Record.',

   prototype : {
     maxSize : 1048576,
     recording : false,
   prototype : {
     maxSize : 1048576,
     recording : false,


@@ -73,16 +73,16 @@ Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
       this._bandPassFilterNode.gain.value = 25;
 
       requestHandler = function bufferFile(ev) {
       this._bandPassFilterNode.gain.value = 25;
 
       requestHandler = function bufferFile(ev) {

-        var request = event.target;
+        var request = ev.target;

         console.log("Reverb loading");
         this.context.decodeAudioData(request.response, function(buffer){ 
           console.log("Reverb loaded");
           this._convolverNode.buffer = buffer;
         console.log("Reverb loading");
         this.context.decodeAudioData(request.response, function(buffer){ 
           console.log("Reverb loaded");
           this._convolverNode.buffer = buffer;

-        });
+        }.bind(this));

       }.bind(this);
 
       request = new XMLHttpRequest();
       }.bind(this);
 
       request = new XMLHttpRequest();

-      request.open('GET', '/reverb.aiff', true);
+      request.open('GET', '/reverb.ogg', true);

       request.responseType = 'arraybuffer';
       request.addEventListener('load', requestHandler, false);
       request.send();
       request.responseType = 'arraybuffer';
       request.addEventListener('load', requestHandler, false);
       request.send();