Skip to content

Remove unwrapArray #45

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unwrapArray #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions node-phantom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ function callbackOrDummy(callback){
if(callback===undefined)callback=function(){};
return callback;
}
function unwrapArray(arr) {
return arr && arr.length == 1 ? arr[0] : arr
}

module.exports={
create:function(callback,options){
Expand Down Expand Up @@ -177,7 +174,7 @@ module.exports={
var id = request[0];
var cmd = request[1];
var callback = callbackOrDummy(pages[id] ? pages[id][cmd] : undefined);
callback(unwrapArray(request[2]));
callback.apply(null, request[2]);
});
var proxy={
createPage:function(callback){
Expand Down
28 changes: 14 additions & 14 deletions test/testpagepushnotifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ exports.testPhantomPagePushNotifications = function(beforeExit,assert) {
},errOr(function() {
//console.log(events);
assert.eql(events.onLoadStarted.length, 1);
assert.eql(events.onUrlChanged,[url]);
assert.eql(events.onUrlChanged,[[url]]);
assert.eql(events.onResourceRequested.length, 1);
assert.eql(events.onResourceReceived.length, 2);
assert.eql(events.onResourceReceived[0].stage, 'start');
assert.eql(events.onResourceReceived[1].stage, 'end');
assert.eql(events.onResourceReceived[0][0].stage, 'start');
assert.eql(events.onResourceReceived[1][0].stage, 'end');

assert.eql(events.onCallback, [{ msg: "callPhantom" }]);
assert.eql(events.onConsoleMessage, ['POW', 'WOW']);
assert.eql(events.onCallback, [[{ msg: "callPhantom" }]]);
assert.eql(events.onConsoleMessage, [['POW'], ['WOW']]);

assert.eql(events.onError.length, 1);
assert.eql(events.onError[0].length, 2);
Expand All @@ -41,7 +41,7 @@ exports.testPhantomPagePushNotifications = function(beforeExit,assert) {
console.log(a);
console.log(b);
}, errOr(function(){
assert.eql(events.onConsoleMessage, ['A', 'B']);
assert.eql(events.onConsoleMessage, [['A'], ['B']]);

ph.createPage(errOr(function(page){
page.onLoadFinished = function(){
Expand All @@ -64,23 +64,23 @@ exports.testPhantomPagePushNotifications = function(beforeExit,assert) {
function registerCallbacks(page) {
var events = {};
var callbacks = [
'onAlert','onConfirm','onConsoleMessage','onError', 'onInitialized',/*'onLoadFinished',*/
'onLoadStarted','onPrompt', 'onResourceRequested','onResourceReceived','onUrlChanged',
'onCallback'
];
'onAlert','onConfirm','onConsoleMessage','onError', 'onInitialized',/*'onLoadFinished',*/
'onLoadStarted','onPrompt', 'onResourceRequested','onResourceReceived','onUrlChanged',
'onCallback'
];
callbacks.forEach(function(cb) {
page[cb] = function(evt) {
if (!events[cb]) events[cb] = [];
events[cb].push(evt);
}
})
events[cb].push(Array.prototype.slice.call(arguments));
};
});
return events;
}

function errOr(fn) {
return function(err, res) {
assert.ifError(err);
fn(res);
}
};
}
};