Merge pull request #994 from Jared-Sprague/master

Fixing callbacks in preload()

Author: Lauren McCarthy

examples/loadingscreen/preload_success_callbacks.js

@@ -33,15 +33,15 @@ function successFont() {
 
 function preload() {
   // try with callbacks
-  myJson = loadJSON('http://api.openweathermap.org/data/2.5/weather?q=London,uk', successJSON);
+  myJson = loadJSON('test.json', successJSON);
   banana = loadImage('banana.png', successImage);
   strings = loadStrings('test.txt', successStrings);
   xml = loadXML('test.xml', successXML);
   myTable = loadTable('mammals.csv', 'csv', 'header', successTable);
   myFont = loadFont('AvenirNextLTPro-Demi.otf', successFont);
 
   // try with no callbacks
-  myJson2 = loadJSON('http://api.openweathermap.org/data/2.5/weather?q=London,uk');
+  myJson2 = loadJSON('test.json');
   banana2 = loadImage('banana.png');
   strings2 = loadStrings('test.txt');
   xml2 = loadXML('test.xml');
@@ -62,8 +62,8 @@ function draw() {
   image(banana, 0, y);
   image(banana2, 0, y += 50);
 
-  text(myJson.main.humidity, 0, y += 50);
-  text(myJson2.main.humidity, 0, y += 50);
+  text(myJson.a, 0, y += 50);
+  text(myJson2.a, 0, y += 50);
 
   text(strings.length, 0, y += 50);
   text(strings2.length, 0, y += 50);

examples/loadingscreen/test.json

@@ -0,0 +1,3 @@
+{
+  "a": 1
+}

src/image/loading_displaying.js

@@ -61,8 +61,7 @@ require('../core/error_helpers');
 p5.prototype.loadImage = function(path, successCallback, failureCallback) {
   var img = new Image();
   var pImg = new p5.Image(1, 1, this);
-  var decrementPreload = p5._getDecrementPreload.call(this,
-    path, successCallback, failureCallback);
+  var decrementPreload = p5._getDecrementPreload.apply(this, arguments);
 
   img.onload = function() {
     pImg.width = pImg.canvas.width = img.width;

src/io/files.js

@@ -88,8 +88,7 @@ p5._getDecrementPreload = function() {
 p5.prototype.loadFont = function(path, onSuccess, onError) {
 
   var p5Font = new p5.Font(this);
-  var decrementPreload = p5._getDecrementPreload.call(this,
-    path, onSuccess, onError);
+  var decrementPreload = p5._getDecrementPreload.apply(this, arguments);
 
   opentype.load(path, function(err, font) {
 
@@ -292,7 +291,7 @@ p5.prototype.loadJSON = function() {
 p5.prototype.loadStrings = function (path, callback) {
   var ret = [];
   var req = new XMLHttpRequest();
-  var decrementPreload = p5._getDecrementPreload.call(this, path, callback);
+  var decrementPreload = p5._getDecrementPreload.apply(this, arguments);
 
   req.addEventListener('error', function () {
     console.log('An error occurred loading strings: ' + path);
@@ -407,7 +406,7 @@ p5.prototype.loadTable = function (path) {
   var header = false;
   var sep = ',';
   var separatorSet = false;
-  var decrementPreload = p5._getDecrementPreload.call(this, path);
+  var decrementPreload = p5._getDecrementPreload.apply(this, arguments);
 
   for (var i = 1; i < arguments.length; i++) {
     if ((typeof(arguments[i]) === 'function') &&
@@ -635,7 +634,7 @@ function makeObject(row, headers) {
  */
 p5.prototype.loadXML = function(path, callback) {
   var ret = document.implementation.createDocument(null, null);
-  var decrementPreload = p5._getDecrementPreload.call(this, path, callback);
+  var decrementPreload = p5._getDecrementPreload.apply(this, arguments);
 
   reqwest({
     url: path,