1
- /*! p5.js v0.3.11 November 23, 2014 */
1
+ /*! p5.js v0.3.12 November 23, 2014 */
2
2
var shim = function ( require ) {
3
3
window . requestDraw = function ( ) {
4
4
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) {
2423
2423
else
2424
2424
context [ name ] = definition ( ) ;
2425
2425
} ( 'reqwest' , this , function ( ) {
2426
- var win = window , doc = document , httpsRe = / ^ h t t p / , protocolRe = / ( ^ \w + ) : \/ \/ / , twoHundo = / ^ ( 2 0 \d | 1 2 2 3 ) $ / , 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 ( ) {
2426
+ var win = window , doc = document , twoHundo = / ^ ( 2 0 \d | 1 2 2 3 ) $ / , 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 ( ) {
2427
2427
} , isArray = typeof Array . isArray == 'function' ? Array . isArray : function ( a ) {
2428
2428
return a instanceof Array ;
2429
2429
} , defaultHeaders = {
@@ -2457,20 +2457,13 @@ var imagepixels = function (require, core, filters, p5Color) {
2457
2457
return data ;
2458
2458
}
2459
2459
} ;
2460
- function succeed ( r ) {
2461
- var protocol = protocolRe . exec ( r . url ) ;
2462
- protocol = protocol && protocol [ 1 ] || window . location . protocol ;
2463
- return httpsRe . test ( protocol ) ? twoHundo . test ( r . request . status ) : ! ! r . request . response ;
2464
- }
2465
2460
function handleReadyState ( r , success , error ) {
2466
2461
return function ( ) {
2467
2462
if ( r . _aborted )
2468
2463
return error ( r . request ) ;
2469
- if ( r . _timedOut )
2470
- return error ( r . request , 'Request is aborted: timeout' ) ;
2471
2464
if ( r . request && r . request [ readyState ] == 4 ) {
2472
2465
r . request . onreadystatechange = noop ;
2473
- if ( succeed ( r ) )
2466
+ if ( twoHundo . test ( r . request . status ) )
2474
2467
success ( r . request ) ;
2475
2468
else
2476
2469
error ( r . request ) ;
@@ -2480,10 +2473,9 @@ var imagepixels = function (require, core, filters, p5Color) {
2480
2473
function setHeaders ( http , o ) {
2481
2474
var headers = o [ 'headers' ] || { } , h ;
2482
2475
headers [ 'Accept' ] = headers [ 'Accept' ] || defaultHeaders [ 'accept' ] [ o [ 'type' ] ] || defaultHeaders [ 'accept' ] [ '*' ] ;
2483
- var isAFormData = typeof FormData === 'function' && o [ 'data' ] instanceof FormData ;
2484
2476
if ( ! o [ 'crossOrigin' ] && ! headers [ requestedWith ] )
2485
2477
headers [ requestedWith ] = defaultHeaders [ 'requestedWith' ] ;
2486
- if ( ! headers [ contentType ] && ! isAFormData )
2478
+ if ( ! headers [ contentType ] )
2487
2479
headers [ contentType ] = o [ 'contentType' ] || defaultHeaders [ 'contentType' ] ;
2488
2480
for ( h in headers )
2489
2481
headers . hasOwnProperty ( h ) && 'setRequestHeader' in http && http . setRequestHeader ( h , headers [ h ] ) ;
@@ -2515,6 +2507,7 @@ var imagepixels = function (require, core, filters, p5Color) {
2515
2507
script . src = url ;
2516
2508
script . async = true ;
2517
2509
if ( typeof script . onreadystatechange !== 'undefined' && ! isIE10 ) {
2510
+ script . event = 'onclick' ;
2518
2511
script . htmlFor = script . id = '_reqwest_' + reqId ;
2519
2512
}
2520
2513
script . onload = script . onreadystatechange = function ( ) {
@@ -2575,15 +2568,9 @@ var imagepixels = function (require, core, filters, p5Color) {
2575
2568
this . fn = fn ;
2576
2569
init . apply ( this , arguments ) ;
2577
2570
}
2578
- function setType ( header ) {
2579
- if ( header . match ( 'json' ) )
2580
- return 'json' ;
2581
- if ( header . match ( 'javascript' ) )
2582
- return 'js' ;
2583
- if ( header . match ( 'text' ) )
2584
- return 'html' ;
2585
- if ( header . match ( 'xml' ) )
2586
- return 'xml' ;
2571
+ function setType ( url ) {
2572
+ var m = url . match ( / \. ( j s o n | j s o n p | h t m l | x m l ) ( \? | $ ) / ) ;
2573
+ return m ? m [ 1 ] : 'js' ;
2587
2574
}
2588
2575
function init ( o , fn ) {
2589
2576
this . url = typeof o == 'string' ? o : o [ 'url' ] ;
@@ -2596,12 +2583,12 @@ var imagepixels = function (require, core, filters, p5Color) {
2596
2583
this . _completeHandlers = [ ] ;
2597
2584
this . _erred = false ;
2598
2585
this . _responseArgs = { } ;
2599
- var self = this ;
2586
+ var self = this , type = o [ 'type' ] || setType ( this . url ) ;
2600
2587
fn = fn || function ( ) {
2601
2588
} ;
2602
2589
if ( o [ 'timeout' ] ) {
2603
2590
this . timeout = setTimeout ( function ( ) {
2604
- timedOut ( ) ;
2591
+ self . abort ( ) ;
2605
2592
} , o [ 'timeout' ] ) ;
2606
2593
}
2607
2594
if ( o [ 'success' ] ) {
@@ -2627,7 +2614,6 @@ var imagepixels = function (require, core, filters, p5Color) {
2627
2614
}
2628
2615
}
2629
2616
function success ( resp ) {
2630
- var type = o [ 'type' ] || resp && setType ( resp . getResponseHeader ( 'Content-Type' ) ) ;
2631
2617
resp = type !== 'jsonp' ? self . request : resp ;
2632
2618
var filteredResponse = globalSetupOptions . dataFilter ( resp . responseText , type ) , r = filteredResponse ;
2633
2619
try {
@@ -2663,10 +2649,6 @@ var imagepixels = function (require, core, filters, p5Color) {
2663
2649
}
2664
2650
complete ( resp ) ;
2665
2651
}
2666
- function timedOut ( ) {
2667
- self . _timedOut = true ;
2668
- self . request . abort ( ) ;
2669
- }
2670
2652
function error ( resp , msg , t ) {
2671
2653
resp = self . request ;
2672
2654
self . _responseArgs . resp = resp ;
@@ -2718,9 +2700,6 @@ var imagepixels = function (require, core, filters, p5Color) {
2718
2700
this . _errorHandlers . push ( fn ) ;
2719
2701
}
2720
2702
return this ;
2721
- } ,
2722
- 'catch' : function ( fn ) {
2723
- return this . fail ( fn ) ;
2724
2703
}
2725
2704
} ;
2726
2705
function reqwest ( o , fn ) {
0 commit comments