lib/capybara/poltergeist/client/compiled/browser.js in poltergeist-1.10.0 vs lib/capybara/poltergeist/client/compiled/browser.js in poltergeist-1.11.0

- old
+ new

@@ -302,12 +302,15 @@ timeout = (new Date().getTime()) + 2000; } return this.pushFrame(this.current_command, name, timeout); }; - Browser.prototype.pop_frame = function() { - return this.current_command.sendResponse(this.currentPage.popFrame()); + Browser.prototype.pop_frame = function(pop_all) { + if (pop_all == null) { + pop_all = false; + } + return this.current_command.sendResponse(this.currentPage.popFrame(pop_all)); }; Browser.prototype.window_handles = function() { var handles; handles = this.pages.filter(function(p) { @@ -452,10 +455,10 @@ if (!target.containsSelection()) { target.mouseEvent('click'); } for (i = 0, len = keys.length; i < len; i++) { sequence = keys[i]; - key = sequence.key != null ? this.currentPage.keyCode(sequence.key) : sequence; + key = sequence.key != null ? this.currentPage.keyCode(sequence.key) || sequence.key : sequence; if (sequence.modifier != null) { modifier_keys = this.currentPage.keyModifierKeys(sequence.modifier); modifier_code = this.currentPage.keyModifierCode(sequence.modifier); for (j = 0, len1 = modifier_keys.length; j < len1; j++) { modifier_key = modifier_keys[j];