escape --> escapeHelper

Author: therewasaguy

lib/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.13 December 05, 2014 */
+/*! p5.js v0.3.13 December 21, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -2423,7 +2423,7 @@ var imagepixels = function (require, core, filters, p5Color) {
   else
     context[name] = definition();
 }('reqwest', this, function () {
-  var win = window, doc = document, twoHundo = /^(20\d|1223)$/, byTag = 'getElementsByTagName', readyState = 'readyState', contentType = 'Content-Type', requestedWith = 'X-Requested-With', head = doc[byTag]('head')[0], uniqid = 0, callbackPrefix = 'reqwest_' + +new Date(), lastValue, xmlHttpRequest = 'XMLHttpRequest', xDomainRequest = 'XDomainRequest', noop = function () {
+  var win = window, doc = document, httpsRe = /^http/, protocolRe = /(^\w+):\/\//, twoHundo = /^(20\d|1223)$/, byTag = 'getElementsByTagName', readyState = 'readyState', contentType = 'Content-Type', requestedWith = 'X-Requested-With', head = doc[byTag]('head')[0], uniqid = 0, callbackPrefix = 'reqwest_' + +new Date(), lastValue, xmlHttpRequest = 'XMLHttpRequest', xDomainRequest = 'XDomainRequest', noop = function () {
     }, isArray = typeof Array.isArray == 'function' ? Array.isArray : function (a) {
       return a instanceof Array;
     }, defaultHeaders = {
@@ -2457,13 +2457,20 @@ var imagepixels = function (require, core, filters, p5Color) {
         return data;
       }
     };
+  function succeed(r) {
+    var protocol = protocolRe.exec(r.url);
+    protocol = protocol && protocol[1] || window.location.protocol;
+    return httpsRe.test(protocol) ? twoHundo.test(r.request.status) : !!r.request.response;
+  }
   function handleReadyState(r, success, error) {
     return function () {
       if (r._aborted)
         return error(r.request);
+      if (r._timedOut)
+        return error(r.request, 'Request is aborted: timeout');
       if (r.request && r.request[readyState] == 4) {
         r.request.onreadystatechange = noop;
-        if (twoHundo.test(r.request.status))
+        if (succeed(r))
           success(r.request);
         else
           error(r.request);
@@ -2473,9 +2480,10 @@ var imagepixels = function (require, core, filters, p5Color) {
   function setHeaders(http, o) {
     var headers = o['headers'] || {}, h;
     headers['Accept'] = headers['Accept'] || defaultHeaders['accept'][o['type']] || defaultHeaders['accept']['*'];
+    var isAFormData = typeof FormData === 'function' && o['data'] instanceof FormData;
     if (!o['crossOrigin'] && !headers[requestedWith])
       headers[requestedWith] = defaultHeaders['requestedWith'];
-    if (!headers[contentType])
+    if (!headers[contentType] && !isAFormData)
       headers[contentType] = o['contentType'] || defaultHeaders['contentType'];
     for (h in headers)
       headers.hasOwnProperty(h) && 'setRequestHeader' in http && http.setRequestHeader(h, headers[h]);
@@ -2507,7 +2515,6 @@ var imagepixels = function (require, core, filters, p5Color) {
     script.src = url;
     script.async = true;
     if (typeof script.onreadystatechange !== 'undefined' && !isIE10) {
-      script.event = 'onclick';
       script.htmlFor = script.id = '_reqwest_' + reqId;
     }
     script.onload = script.onreadystatechange = function () {
@@ -2568,9 +2575,15 @@ var imagepixels = function (require, core, filters, p5Color) {
     this.fn = fn;
     init.apply(this, arguments);
   }
-  function setType(url) {
-    var m = url.match(/\.(json|jsonp|html|xml)(\?|$)/);
-    return m ? m[1] : 'js';
+  function setType(header) {
+    if (header.match('json'))
+      return 'json';
+    if (header.match('javascript'))
+      return 'js';
+    if (header.match('text'))
+      return 'html';
+    if (header.match('xml'))
+      return 'xml';
   }
   function init(o, fn) {
     this.url = typeof o == 'string' ? o : o['url'];
@@ -2583,12 +2596,12 @@ var imagepixels = function (require, core, filters, p5Color) {
     this._completeHandlers = [];
     this._erred = false;
     this._responseArgs = {};
-    var self = this, type = o['type'] || setType(this.url);
+    var self = this;
     fn = fn || function () {
     };
     if (o['timeout']) {
       this.timeout = setTimeout(function () {
-        self.abort();
+        timedOut();
       }, o['timeout']);
     }
     if (o['success']) {
@@ -2614,6 +2627,7 @@ var imagepixels = function (require, core, filters, p5Color) {
       }
     }
     function success(resp) {
+      var type = o['type'] || resp && setType(resp.getResponseHeader('Content-Type'));
       resp = type !== 'jsonp' ? self.request : resp;
       var filteredResponse = globalSetupOptions.dataFilter(resp.responseText, type), r = filteredResponse;
       try {
@@ -2649,6 +2663,10 @@ var imagepixels = function (require, core, filters, p5Color) {
       }
       complete(resp);
     }
+    function timedOut() {
+      self._timedOut = true;
+      self.request.abort();
+    }
     function error(resp, msg, t) {
       resp = self.request;
       self._responseArgs.resp = resp;
@@ -2700,6 +2718,9 @@ var imagepixels = function (require, core, filters, p5Color) {
         this._errorHandlers.push(fn);
       }
       return this;
+    },
+    'catch': function (fn) {
+      return this.fail(fn);
     }
   };
   function reqwest(o, fn) {
@@ -3659,9 +3680,6 @@ var outputfiles = function (require, core) {
     p5.prototype.endRecord = function () {
       throw 'not yet implemented';
     };
-    p5.prototype.escape = function (content) {
-      return content.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
-    };
     p5.PrintWriter = function (filename, extension) {
       var self = this;
       this.name = filename;
@@ -3800,7 +3818,7 @@ var outputfiles = function (require, core) {
         if (header[0] !== '0') {
           pWriter.println('    <tr>');
           for (var k = 0; k < header.length; k++) {
-            var e = p5.prototype.escape(header[k]);
+            var e = escapeHelper(header[k]);
             pWriter.println('      <td>' + e);
             pWriter.println('      </td>');
           }
@@ -3810,7 +3828,7 @@ var outputfiles = function (require, core) {
           pWriter.println('    <tr>');
           for (var col = 0; col < table.columns.length; col++) {
             var entry = table.rows[row].getString(col);
-            var htmlEntry = p5.prototype.escape(entry);
+            var htmlEntry = escapeHelper(entry);
             pWriter.println('      <td>' + htmlEntry);
             pWriter.println('      </td>');
           }
@@ -3823,6 +3841,9 @@ var outputfiles = function (require, core) {
       pWriter.close();
       pWriter.flush();
     };
+    var escapeHelper = function (content) {
+      return content.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
+    };
     p5.prototype.writeFile = function (dataToDownload, filename, extension) {
       var type = 'application/octet-stream';
       if (p5.prototype._isSafari()) {