Skip to content

Fix onLoadFinished sometimes being called with wrong arguments #147

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

Open
awlayton wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix onLoadFinished sometimes being called with wrong arguments #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a837f95
Fix callbacks sometimes getting array of arguments
awlayton Oct 27, 2016
8f4f240
Remove lint
awlayton Oct 27, 2016
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
12 changes: 1 addition & 11 deletions node-phantom-simple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ function callbackOrDummy(callback, poll_func) {
return callback;
}

function unwrapArray(arr) {
return arr && arr.length === 1 ? arr[0] : arr;
}

function wrapArray(arr) {
// Ensure that arr is an Array
return (arr instanceof Array) ? arr : [ arr ];
Expand Down Expand Up @@ -628,13 +624,7 @@ function setup_long_poll(phantom, port, pages, setup_new_page) {
} else if (pages[r.page_id] && pages[r.page_id][r.callback]) {
callbackFunc = pages[r.page_id][r.callback];

if (callbackFunc.length > 1) {
// We use `apply` if the function is expecting multiple args
callbackFunc.apply(pages[r.page_id], wrapArray(r.args));
} else {
// Old `call` behaviour is deprecated
callbackFunc.call(pages[r.page_id], unwrapArray(r.args));
}
callbackFunc.apply(pages[r.page_id], wrapArray(r.args));
}
} else {
cb = callbackOrDummy(phantom[r.callback]);
Expand Down
2 changes: 1 addition & 1 deletion test/test_page_push_notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ describe('push notifications', function () {
return;
}

assert.equal(status, 'success');
assert.strictEqual(status, 'success');
});
});
});
Expand Down