Skip to content

support for Array and 'number' type checking in httpDo #1943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jmandel1027 wants to merge 7 commits into from
Closed

support for Array and 'number' type checking in httpDo #1943

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
075d38c
added support for int's and array's to 'httpDo'
jmandel1027 May 11, 2017
1df723b
slight tweaks to 'int' and 'array' type support for 'httpDo'
jmandel1027 May 12, 2017
2eacc34
tweaks to 'array' and 'integer' handling in 'httpDo'
jmandel1027 May 12, 2017
f932428
did some documetation and minor formatting
jmandel1027 May 12, 2017
58dbbb7
added error handling for array and int
jmandel1027 May 12, 2017
493d6c9
added checks for typeof Array.isArray() || 'number' to httpDo args
jmandel1027 May 13, 2017
fbae202
serialized data in httpDo args as toString()
jmandel1027 May 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/io/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ p5.prototype.loadJSON = function () {
* function preload() {
* result = loadStrings('assets/test.txt');
* }

* function setup() {
* background(200);
* var ind = floor(random(result.length));
Expand Down Expand Up @@ -466,9 +465,9 @@ p5.prototype.loadTable = function (path) {
var sep = ',';
var separatorSet = false;
var decrementPreload = p5._getDecrementPreload.apply(this, arguments);
if(ext === 'tsv'){ //Only need to check if extension is tsv because csv is default
sep = '\t';

if(ext === 'tsv'){//Only need to check if extension is tsv because csv is default
sep = '\t';
}

for (var i = 1; i < arguments.length; i++) {
Expand Down Expand Up @@ -858,7 +857,7 @@ p5.prototype.httpDo = function () {
type = 'text';
}
}
}else{
} else {
// Provided with arguments
var path = arguments[0];
var method = 'GET';
Expand All @@ -871,15 +870,15 @@ p5.prototype.httpDo = function () {
method = a;
} else if(a === 'json' || a === 'jsonp' || a === 'xml' || a === 'text') {
type = a;
} else {
data = a;
} else if(typeof a === 'number') {
data = a.toString();
}
} else if (typeof a === 'object') {
if(a.hasOwnProperty('jsonpCallback')){
if(a.hasOwnProperty('jsonpCallback')) {
for (var attr in a) {
jsonpOptions[attr] = a[attr];
}
}else{
} else {
data = JSON.stringify(a);
contentType = 'application/json';
}
Expand Down