poltergeist 1.7.0 → 1.8.0

data/lib/capybara/poltergeist/client/cmd.coffee

@@ -0,0 +1,17 @@
+class Poltergeist.Cmd
+  constructor: (@owner, @id, @name, @args)->
+
+  sendResponse: (response) ->
+    errors = @browser.currentPage.errors
+    @browser.currentPage.clearErrors()
+
+    if errors.length > 0 && @browser.js_errors
+      @sendError(new Poltergeist.JavascriptError(errors))
+    else
+      @owner.sendResponse(@id, response)
+
+  sendError: (errors) ->
+    @owner.sendError(@id, errors)
+
+  run: (@browser) ->
+    @browser.runCommand(this)

data/lib/capybara/poltergeist/client/compiled/agent.js

@@ -1,19 +1,24 @@
 var PoltergeistAgent;
 
 PoltergeistAgent = (function() {
+  PoltergeistAgent.JSON || (PoltergeistAgent.JSON = {
+    parse: JSON.parse,
+    stringify: JSON.stringify
+  });
+
   function PoltergeistAgent() {
     this.elements = [];
     this.nodes = {};
   }
 
   PoltergeistAgent.prototype.externalCall = function(name, args) {
-    var error;
+    var error, error1;
     try {
       return {
         value: this[name].apply(this, args)
       };
-    } catch (_error) {
-      error = _error;
+    } catch (error1) {
+      error = error1;
       return {
         error: {
           message: error.toString(),
@@ -24,17 +29,17 @@ PoltergeistAgent = (function() {
   };
 
   PoltergeistAgent.stringify = function(object) {
-    var error;
+    var error, error1;
     try {
-      return JSON.stringify(object, function(key, value) {
+      return PoltergeistAgent.JSON.stringify(object, function(key, value) {
         if (Array.isArray(this[key])) {
           return this[key];
         } else {
           return value;
         }
       });
-    } catch (_error) {
-      error = _error;
+    } catch (error1) {
+      error = error1;
       if (error instanceof TypeError) {
         return '"(cyclic structure)"';
       } else {
@@ -48,7 +53,7 @@ PoltergeistAgent = (function() {
   };
 
   PoltergeistAgent.prototype.find = function(method, selector, within) {
-    var el, error, i, results, xpath, _i, _len, _results;
+    var el, error, error1, i, j, len, results, results1, xpath;
     if (within == null) {
       within = document;
     }
@@ -56,24 +61,24 @@ PoltergeistAgent = (function() {
       if (method === "xpath") {
         xpath = document.evaluate(selector, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
         results = (function() {
-          var _i, _ref, _results;
-          _results = [];
-          for (i = _i = 0, _ref = xpath.snapshotLength; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
-            _results.push(xpath.snapshotItem(i));
+          var j, ref, results1;
+          results1 = [];
+          for (i = j = 0, ref = xpath.snapshotLength; 0 <= ref ? j < ref : j > ref; i = 0 <= ref ? ++j : --j) {
+            results1.push(xpath.snapshotItem(i));
           }
-          return _results;
+          return results1;
         })();
       } else {
         results = within.querySelectorAll(selector);
       }
-      _results = [];
-      for (_i = 0, _len = results.length; _i < _len; _i++) {
-        el = results[_i];
-        _results.push(this.register(el));
+      results1 = [];
+      for (j = 0, len = results.length; j < len; j++) {
+        el = results[j];
+        results1.push(this.register(el));
       }
-      return _results;
-    } catch (_error) {
-      error = _error;
+      return results1;
+    } catch (error1) {
+      error = error1;
       if (error.code === DOMException.SYNTAX_ERR || error.code === 51) {
         throw new PoltergeistAgent.InvalidSelector;
       } else {
@@ -95,8 +100,8 @@ PoltergeistAgent = (function() {
   };
 
   PoltergeistAgent.prototype.get = function(id) {
-    var _base;
-    return (_base = this.nodes)[id] || (_base[id] = new PoltergeistAgent.Node(this, this.elements[id]));
+    var base;
+    return (base = this.nodes)[id] || (base[id] = new PoltergeistAgent.Node(this, this.elements[id]));
   };
 
   PoltergeistAgent.prototype.nodeCall = function(id, name, args) {
@@ -153,9 +158,9 @@ PoltergeistAgent.Node = (function() {
     FORM: ['submit']
   };
 
-  function Node(agent, element) {
+  function Node(agent, element1) {
     this.agent = agent;
-    this.element = element;
+    this.element = element1;
   }
 
   Node.prototype.parentId = function() {
@@ -178,19 +183,20 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.isObsolete = function() {
-    var obsolete,
-      _this = this;
-    obsolete = function(element) {
-      if (element.parentNode != null) {
-        if (element.parentNode === document) {
-          return false;
+    var obsolete;
+    obsolete = (function(_this) {
+      return function(element) {
+        if (element.parentNode != null) {
+          if (element.parentNode === document) {
+            return false;
+          } else {
+            return obsolete(element.parentNode);
+          }
         } else {
-          return obsolete(element.parentNode);
+          return true;
         }
-      } else {
-        return true;
-      }
-    };
+      };
+    })(this);
     return obsolete(this.element);
   };
 
@@ -200,6 +206,10 @@ PoltergeistAgent.Node = (function() {
     event.initEvent('change', true, false);
     if (this.element.nodeName === 'OPTION') {
       element = this.element.parentNode;
+      if (element.nodeName === 'OPTGROUP') {
+        element = element.parentNode;
+      }
+      element;
     } else {
       element = this.element;
     }
@@ -265,12 +275,16 @@ PoltergeistAgent.Node = (function() {
     return window.getSelection().deleteFromDocument();
   };
 
+  Node.prototype.getProperty = function(name) {
+    return this.element[name];
+  };
+
   Node.prototype.getAttributes = function() {
-    var attr, attrs, i, _i, _len, _ref;
+    var attr, attrs, j, len, ref;
     attrs = {};
-    _ref = this.element.attributes;
-    for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) {
-      attr = _ref[i];
+    ref = this.element.attributes;
+    for (j = 0, len = ref.length; j < len; j++) {
+      attr = ref[j];
       attrs[attr.name] = attr.value.replace("\n", "\\n");
     }
     return attrs;
@@ -285,41 +299,44 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.scrollIntoView = function() {
-    return this.element.scrollIntoViewIfNeeded();
+    this.element.scrollIntoViewIfNeeded();
+    if (!this.isInViewport()) {
+      return this.element.scrollIntoView();
+    }
   };
 
   Node.prototype.value = function() {
-    var option, _i, _len, _ref, _results;
+    var j, len, option, ref, results1;
     if (this.element.tagName === 'SELECT' && this.element.multiple) {
-      _ref = this.element.children;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        option = _ref[_i];
+      ref = this.element.children;
+      results1 = [];
+      for (j = 0, len = ref.length; j < len; j++) {
+        option = ref[j];
         if (option.selected) {
-          _results.push(option.value);
+          results1.push(option.value);
         }
       }
-      return _results;
+      return results1;
     } else {
       return this.element.value;
     }
   };
 
   Node.prototype.set = function(value) {
-    var char, keyCode, _i, _len;
+    var char, j, keyCode, len;
     if (this.element.readOnly) {
       return;
     }
     if (this.element.maxLength >= 0) {
       value = value.substr(0, this.element.maxLength);
     }
-    this.element.value = '';
     this.trigger('focus');
+    this.element.value = '';
     if (this.element.type === 'number') {
       this.element.value = value;
     } else {
-      for (_i = 0, _len = value.length; _i < _len; _i++) {
-        char = value[_i];
+      for (j = 0, len = value.length; j < len; j++) {
+        char = value[j];
         keyCode = this.characterToKeyCode(char);
         this.keyupdowned('keydown', keyCode);
         this.element.value += char;
@@ -363,16 +380,22 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.isVisible = function(element) {
-    if (!element) {
-      element = this.element;
-    }
-    if (window.getComputedStyle(element).display === 'none') {
-      return false;
-    } else if (element.parentElement) {
-      return this.isVisible(element.parentElement);
-    } else {
-      return true;
+    var style;
+    element || (element = this.element);
+    while (element) {
+      style = window.getComputedStyle(element);
+      if (style.display === 'none' || style.visibility === 'hidden' || parseFloat(style.opacity) === 0) {
+        return false;
+      }
+      element = element.parentElement;
     }
+    return true;
+  };
+
+  Node.prototype.isInViewport = function() {
+    var rect;
+    rect = this.element.getBoundingClientRect();
+    return rect.top >= 0 && rect.left >= 0 && rect.bottom <= window.innerHeight && rect.right <= window.innerWidth;
   };
 
   Node.prototype.isDisabled = function() {
@@ -380,16 +403,17 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.path = function() {
-    var elements, selectors,
-      _this = this;
-    elements = this.parentIds().reverse().map(function(id) {
-      return _this.agent.get(id);
-    });
+    var elements, selectors;
+    elements = this.parentIds().reverse().map((function(_this) {
+      return function(id) {
+        return _this.agent.get(id);
+      };
+    })(this));
     elements.push(this);
     selectors = elements.map(function(el) {
       var prev_siblings;
       prev_siblings = el.find('xpath', "./preceding-sibling::" + (el.tagName()));
-      return "" + (el.tagName()) + "[" + (prev_siblings.length + 1) + "]";
+      return (el.tagName()) + "[" + (prev_siblings.length + 1) + "]";
     });
     return "//" + selectors.join('/');
   };
@@ -488,16 +512,18 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.getSelector = function(el) {
-    var className, selector, _i, _len, _ref;
+    var className, classes, j, len, ref, ref1, selector;
     selector = el.tagName !== 'HTML' ? this.getSelector(el.parentNode) + ' ' : '';
     selector += el.tagName.toLowerCase();
     if (el.id) {
       selector += "#" + el.id;
     }
-    _ref = el.classList;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      className = _ref[_i];
-      selector += "." + className;
+    classes = el.classList || ((ref = el.getAttribute('class')) != null ? (ref1 = ref.trim()) != null ? ref1.split(/\s+/) : void 0 : void 0) || [];
+    for (j = 0, len = classes.length; j < len; j++) {
+      className = classes[j];
+      if (className !== '') {
+        selector += "." + className;
+      }
     }
     return selector;
   };

data/lib/capybara/poltergeist/client/compiled/browser.js

@@ -1,8 +1,7 @@
-var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
 Poltergeist.Browser = (function() {
-  function Browser(owner, width, height) {
-    this.owner = owner;
+  function Browser(width, height) {
     this.width = width || 1024;
     this.height = height || 768;
     this.pages = [];
@@ -16,9 +15,8 @@ Poltergeist.Browser = (function() {
   }
 
   Browser.prototype.resetPage = function() {
-    var _ref,
-      _this = this;
-    _ref = [0, []], this._counter = _ref[0], this.pages = _ref[1];
+    var ref;
+    ref = [0, []], this._counter = ref[0], this.pages = ref[1];
     if (this.page != null) {
       if (!this.page.closed) {
         if (this.page.currentUrl() !== 'about:blank') {
@@ -38,33 +36,41 @@ Poltergeist.Browser = (function() {
     this.processed_modal_messages = [];
     this.confirm_processes = [];
     this.prompt_responses = [];
-    this.page["native"]().onAlert = function(msg) {
-      _this.setModalMessage(msg);
-    };
-    this.page["native"]().onConfirm = function(msg) {
-      var process;
-      process = _this.confirm_processes.pop();
-      if (process === void 0) {
-        process = true;
-      }
-      _this.setModalMessage(msg);
-      return process;
-    };
-    this.page["native"]().onPrompt = function(msg, defaultVal) {
-      var response;
-      response = _this.prompt_responses.pop();
-      if (response === void 0 || response === false) {
-        response = defaultVal;
-      }
-      _this.setModalMessage(msg);
-      return response;
-    };
-    return this.page.onPageCreated = function(newPage) {
-      var page;
-      page = new Poltergeist.WebPage(newPage);
-      page.handle = "" + (_this._counter++);
-      return _this.pages.push(page);
-    };
+    this.page["native"]().onAlert = (function(_this) {
+      return function(msg) {
+        _this.setModalMessage(msg);
+      };
+    })(this);
+    this.page["native"]().onConfirm = (function(_this) {
+      return function(msg) {
+        var process;
+        process = _this.confirm_processes.pop();
+        if (process === void 0) {
+          process = true;
+        }
+        _this.setModalMessage(msg);
+        return process;
+      };
+    })(this);
+    this.page["native"]().onPrompt = (function(_this) {
+      return function(msg, defaultVal) {
+        var response;
+        response = _this.prompt_responses.pop();
+        if (response === void 0 || response === false) {
+          response = defaultVal;
+        }
+        _this.setModalMessage(msg);
+        return response;
+      };
+    })(this);
+    return this.page.onPageCreated = (function(_this) {
+      return function(newPage) {
+        var page;
+        page = new Poltergeist.WebPage(newPage);
+        page.handle = "" + (_this._counter++);
+        return _this.pages.push(page);
+      };
+    })(this);
   };
 
   Browser.prototype.getPageByHandle = function(handle) {
@@ -73,9 +79,10 @@ Poltergeist.Browser = (function() {
     })[0];
   };
 
-  Browser.prototype.runCommand = function(name, args) {
+  Browser.prototype.runCommand = function(command) {
+    this.current_command = command;
     this.currentPage.state = 'default';
-    return this[name].apply(this, args);
+    return this[command.name].apply(this, command.args);
   };
 
   Browser.prototype.debug = function(message) {
@@ -88,20 +95,9 @@ Poltergeist.Browser = (function() {
     return this.processed_modal_messages.push(msg);
   };
 
-  Browser.prototype.sendResponse = function(response) {
-    var errors;
-    errors = this.currentPage.errors;
-    this.currentPage.clearErrors();
-    if (errors.length > 0 && this.js_errors) {
-      return this.owner.sendError(new Poltergeist.JavascriptError(errors));
-    } else {
-      return this.owner.sendResponse(response);
-    }
-  };
-
   Browser.prototype.add_extension = function(extension) {
     this.currentPage.injectExtension(extension);
-    return this.sendResponse('success');
+    return this.current_command.sendResponse('success');
   };
 
   Browser.prototype.node = function(page_id, id) {
@@ -113,8 +109,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.visit = function(url) {
-    var prevUrl,
-      _this = this;
+    var command, prevUrl;
     this.currentPage.state = 'loading';
     this.processed_modal_messages = [];
     this.confirm_processes = [];
@@ -123,84 +118,91 @@ Poltergeist.Browser = (function() {
     this.currentPage.open(url);
     if (/#/.test(url) && prevUrl.split('#')[0] === url.split('#')[0]) {
       this.currentPage.state = 'default';
-      return this.sendResponse({
+      return this.current_command.sendResponse({
         status: 'success'
       });
     } else {
-      return this.currentPage.waitState('default', function() {
-        if (_this.currentPage.statusCode === null && _this.currentPage.status === 'fail') {
-          return _this.owner.sendError(new Poltergeist.StatusFailError);
-        } else {
-          return _this.sendResponse({
-            status: _this.currentPage.status
-          });
-        }
-      });
+      command = this.current_command;
+      return this.currentPage.waitState('default', (function(_this) {
+        return function() {
+          if (_this.currentPage.statusCode === null && _this.currentPage.status === 'fail') {
+            return command.sendError(new Poltergeist.StatusFailError(url));
+          } else {
+            return command.sendResponse({
+              status: _this.currentPage.status
+            });
+          }
+        };
+      })(this));
     }
   };
 
   Browser.prototype.current_url = function() {
-    return this.sendResponse(this.currentPage.currentUrl());
+    return this.current_command.sendResponse(this.currentPage.currentUrl());
   };
 
   Browser.prototype.status_code = function() {
-    return this.sendResponse(this.currentPage.statusCode);
+    return this.current_command.sendResponse(this.currentPage.statusCode);
   };
 
   Browser.prototype.body = function() {
-    return this.sendResponse(this.currentPage.content());
+    return this.current_command.sendResponse(this.currentPage.content());
   };
 
   Browser.prototype.source = function() {
-    return this.sendResponse(this.currentPage.source);
+    return this.current_command.sendResponse(this.currentPage.source);
   };
 
   Browser.prototype.title = function() {
-    return this.sendResponse(this.currentPage.title());
+    return this.current_command.sendResponse(this.currentPage.title());
   };
 
   Browser.prototype.find = function(method, selector) {
-    return this.sendResponse({
+    return this.current_command.sendResponse({
       page_id: this.currentPage.id,
       ids: this.currentPage.find(method, selector)
     });
   };
 
   Browser.prototype.find_within = function(page_id, id, method, selector) {
-    return this.sendResponse(this.node(page_id, id).find(method, selector));
+    return this.current_command.sendResponse(this.node(page_id, id).find(method, selector));
   };
 
   Browser.prototype.all_text = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).allText());
+    return this.current_command.sendResponse(this.node(page_id, id).allText());
   };
 
   Browser.prototype.visible_text = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).visibleText());
+    return this.current_command.sendResponse(this.node(page_id, id).visibleText());
   };
 
   Browser.prototype.delete_text = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).deleteText());
+    return this.current_command.sendResponse(this.node(page_id, id).deleteText());
+  };
+
+  Browser.prototype.property = function(page_id, id, name) {
+    return this.current_command.sendResponse(this.node(page_id, id).getProperty(name));
   };
 
   Browser.prototype.attribute = function(page_id, id, name) {
-    return this.sendResponse(this.node(page_id, id).getAttribute(name));
+    return this.current_command.sendResponse(this.node(page_id, id).getAttribute(name));
   };
 
   Browser.prototype.attributes = function(page_id, id, name) {
-    return this.sendResponse(this.node(page_id, id).getAttributes());
+    return this.current_command.sendResponse(this.node(page_id, id).getAttributes());
   };
 
   Browser.prototype.parents = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).parentIds());
+    return this.current_command.sendResponse(this.node(page_id, id).parentIds());
   };
 
   Browser.prototype.value = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).value());
+    return this.current_command.sendResponse(this.node(page_id, id).value());
   };
 
   Browser.prototype.set = function(page_id, id, value) {
     this.node(page_id, id).set(value);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.select_file = function(page_id, id, value) {
@@ -209,72 +211,91 @@ Poltergeist.Browser = (function() {
     this.currentPage.beforeUpload(node.id);
     this.currentPage.uploadFile('[_poltergeist_selected]', value);
     this.currentPage.afterUpload(node.id);
-    return this.sendResponse(true);
+    if (phantom.version.major === 2) {
+      return this.click(page_id, id);
+    } else {
+      return this.current_command.sendResponse(true);
+    }
   };
 
   Browser.prototype.select = function(page_id, id, value) {
-    return this.sendResponse(this.node(page_id, id).select(value));
+    return this.current_command.sendResponse(this.node(page_id, id).select(value));
   };
 
   Browser.prototype.tag_name = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).tagName());
+    return this.current_command.sendResponse(this.node(page_id, id).tagName());
   };
 
   Browser.prototype.visible = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).isVisible());
+    return this.current_command.sendResponse(this.node(page_id, id).isVisible());
   };
 
   Browser.prototype.disabled = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).isDisabled());
+    return this.current_command.sendResponse(this.node(page_id, id).isDisabled());
   };
 
   Browser.prototype.path = function(page_id, id) {
-    return this.sendResponse(this.node(page_id, id).path());
+    return this.current_command.sendResponse(this.node(page_id, id).path());
   };
 
   Browser.prototype.evaluate = function(script) {
-    return this.sendResponse(this.currentPage.evaluate("function() { return " + script + " }"));
+    return this.current_command.sendResponse(this.currentPage.evaluate("function() { return " + script + " }"));
   };
 
   Browser.prototype.execute = function(script) {
     this.currentPage.execute("function() { " + script + " }");
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.frameUrl = function(frame_name) {
     return this.currentPage.frameUrl(frame_name);
   };
 
-  Browser.prototype.push_frame = function(name, timeout) {
-    var _ref,
-      _this = this;
-    if (timeout == null) {
-      timeout = new Date().getTime() + 2000;
+  Browser.prototype.pushFrame = function(command, name, timeout) {
+    var frame, ref;
+    if (Array.isArray(name)) {
+      frame = this.node.apply(this, name);
+      name = frame.getAttribute('name') || frame.getAttribute('id');
+      if (!name) {
+        frame.setAttribute('name', "_random_name_" + (new Date().getTime()));
+        name = frame.getAttribute('name');
+      }
     }
-    if (_ref = this.frameUrl(name), __indexOf.call(this.currentPage.blockedUrls(), _ref) >= 0) {
-      return this.sendResponse(true);
+    if (ref = this.frameUrl(name), indexOf.call(this.currentPage.blockedUrls(), ref) >= 0) {
+      return command.sendResponse(true);
     } else if (this.currentPage.pushFrame(name)) {
       if (this.currentPage.currentUrl() === 'about:blank') {
         this.currentPage.state = 'awaiting_frame_load';
-        return this.currentPage.waitState('default', function() {
-          return _this.sendResponse(true);
-        });
+        return this.currentPage.waitState('default', (function(_this) {
+          return function() {
+            return command.sendResponse(true);
+          };
+        })(this));
       } else {
-        return this.sendResponse(true);
+        return command.sendResponse(true);
       }
     } else {
       if (new Date().getTime() < timeout) {
-        return setTimeout((function() {
-          return _this.push_frame(name, timeout);
-        }), 50);
+        return setTimeout(((function(_this) {
+          return function() {
+            return _this.pushFrame(command, name, timeout);
+          };
+        })(this)), 50);
       } else {
-        return this.owner.sendError(new Poltergeist.FrameNotFound(name));
+        return command.sendError(new Poltergeist.FrameNotFound(name));
       }
     }
   };
 
+  Browser.prototype.push_frame = function(name, timeout) {
+    if (timeout == null) {
+      timeout = (new Date().getTime()) + 2000;
+    }
+    return this.pushFrame(this.current_command, name, timeout);
+  };
+
   Browser.prototype.pop_frame = function() {
-    return this.sendResponse(this.currentPage.popFrame());
+    return this.current_command.sendResponse(this.currentPage.popFrame());
   };
 
   Browser.prototype.window_handles = function() {
@@ -284,7 +305,7 @@ Poltergeist.Browser = (function() {
     }).map(function(p) {
       return p.handle;
     });
-    return this.sendResponse(handles);
+    return this.current_command.sendResponse(handles);
   };
 
   Browser.prototype.window_handle = function(name) {
@@ -295,21 +316,23 @@ Poltergeist.Browser = (function() {
     handle = name ? (page = this.pages.filter(function(p) {
       return !p.closed && p.windowName() === name;
     })[0], page ? page.handle : null) : this.currentPage.handle;
-    return this.sendResponse(handle);
+    return this.current_command.sendResponse(handle);
   };
 
   Browser.prototype.switch_to_window = function(handle) {
-    var page,
-      _this = this;
+    var command, page;
+    command = this.current_command;
     page = this.getPageByHandle(handle);
     if (page) {
       if (page !== this.currentPage) {
-        return page.waitState('default', function() {
-          _this.currentPage = page;
-          return _this.sendResponse(true);
-        });
+        return page.waitState('default', (function(_this) {
+          return function() {
+            _this.currentPage = page;
+            return command.sendResponse(true);
+          };
+        })(this));
       } else {
-        return this.sendResponse(true);
+        return command.sendResponse(true);
       }
     } else {
       throw new Poltergeist.NoSuchWindowError;
@@ -318,7 +341,7 @@ Poltergeist.Browser = (function() {
 
   Browser.prototype.open_new_window = function() {
     this.execute('window.open()');
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.close_window = function(handle) {
@@ -326,32 +349,34 @@ Poltergeist.Browser = (function() {
     page = this.getPageByHandle(handle);
     if (page) {
       page.release();
-      return this.sendResponse(true);
+      return this.current_command.sendResponse(true);
     } else {
-      return this.sendResponse(false);
+      return this.current_command.sendResponse(false);
     }
   };
 
   Browser.prototype.mouse_event = function(page_id, id, name) {
-    var node,
-      _this = this;
+    var command, node;
     node = this.node(page_id, id);
     this.currentPage.state = 'mouse_event';
     this.last_mouse_event = node.mouseEvent(name);
-    return setTimeout(function() {
-      if (_this.currentPage.state === 'mouse_event') {
-        _this.currentPage.state = 'default';
-        return _this.sendResponse({
-          position: _this.last_mouse_event
-        });
-      } else {
-        return _this.currentPage.waitState('default', function() {
-          return _this.sendResponse({
+    command = this.current_command;
+    return setTimeout((function(_this) {
+      return function() {
+        if (_this.currentPage.state === 'mouse_event') {
+          _this.currentPage.state = 'default';
+          return command.sendResponse({
             position: _this.last_mouse_event
           });
-        });
-      }
-    }, 5);
+        } else {
+          return _this.currentPage.waitState('default', function() {
+            return command.sendResponse({
+              position: _this.last_mouse_event
+            });
+          });
+        }
+      };
+    })(this), 5);
   };
 
   Browser.prototype.click = function(page_id, id) {
@@ -372,7 +397,7 @@ Poltergeist.Browser = (function() {
 
   Browser.prototype.click_coordinates = function(x, y) {
     this.currentPage.sendEvent('click', x, y);
-    return this.sendResponse({
+    return this.current_command.sendResponse({
       click: {
         x: x,
         y: y
@@ -382,26 +407,26 @@ Poltergeist.Browser = (function() {
 
   Browser.prototype.drag = function(page_id, id, other_id) {
     this.node(page_id, id).dragTo(this.node(page_id, other_id));
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.drag_by = function(page_id, id, x, y) {
     this.node(page_id, id).dragBy(x, y);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.trigger = function(page_id, id, event) {
     this.node(page_id, id).trigger(event);
-    return this.sendResponse(event);
+    return this.current_command.sendResponse(event);
   };
 
   Browser.prototype.equals = function(page_id, id, other_id) {
-    return this.sendResponse(this.node(page_id, id).isEqual(this.node(page_id, other_id)));
+    return this.current_command.sendResponse(this.node(page_id, id).isEqual(this.node(page_id, other_id)));
   };
 
   Browser.prototype.reset = function() {
     this.resetPage();
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.scroll_to = function(left, top) {
@@ -409,35 +434,35 @@ Poltergeist.Browser = (function() {
       left: left,
       top: top
     });
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.send_keys = function(page_id, id, keys) {
-    var key, modifier_code, modifier_key, modifier_keys, sequence, target, _i, _j, _k, _len, _len1, _len2;
+    var i, j, k, key, len, len1, len2, modifier_code, modifier_key, modifier_keys, sequence, target;
     target = this.node(page_id, id);
     if (!target.containsSelection()) {
       target.mouseEvent('click');
     }
-    for (_i = 0, _len = keys.length; _i < _len; _i++) {
-      sequence = keys[_i];
+    for (i = 0, len = keys.length; i < len; i++) {
+      sequence = keys[i];
       key = sequence.key != null ? this.currentPage.keyCode(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];
+        for (j = 0, len1 = modifier_keys.length; j < len1; j++) {
+          modifier_key = modifier_keys[j];
           this.currentPage.sendEvent('keydown', modifier_key);
         }
         this.currentPage.sendEvent('keypress', key, null, null, modifier_code);
-        for (_k = 0, _len2 = modifier_keys.length; _k < _len2; _k++) {
-          modifier_key = modifier_keys[_k];
+        for (k = 0, len2 = modifier_keys.length; k < len2; k++) {
+          modifier_key = modifier_keys[k];
           this.currentPage.sendEvent('keyup', modifier_key);
         }
       } else {
         this.currentPage.sendEvent('keypress', key);
       }
     }
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.render_base64 = function(format, full, selector) {
@@ -447,7 +472,7 @@ Poltergeist.Browser = (function() {
     }
     this.set_clip_rect(full, selector);
     encoded_image = this.currentPage.renderBase64(format);
-    return this.sendResponse(encoded_image);
+    return this.current_command.sendResponse(encoded_image);
   };
 
   Browser.prototype.render = function(path, full, selector) {
@@ -465,13 +490,13 @@ Poltergeist.Browser = (function() {
       left: dimensions.left,
       top: dimensions.top
     });
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_clip_rect = function(full, selector) {
-    var dimensions, document, rect, viewport, _ref;
+    var dimensions, document, rect, ref, viewport;
     dimensions = this.currentPage.validatedDimensions();
-    _ref = [dimensions.document, dimensions.viewport], document = _ref[0], viewport = _ref[1];
+    ref = [dimensions.document, dimensions.viewport], document = ref[0], viewport = ref[1];
     rect = full ? {
       left: 0,
       top: 0,
@@ -489,12 +514,12 @@ Poltergeist.Browser = (function() {
 
   Browser.prototype.set_paper_size = function(size) {
     this.currentPage.setPaperSize(size);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_zoom_factor = function(zoom_factor) {
     this.currentPage.setZoomFactor(zoom_factor);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.resize = function(width, height) {
@@ -502,20 +527,20 @@ Poltergeist.Browser = (function() {
       width: width,
       height: height
     });
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.network_traffic = function() {
-    return this.sendResponse(this.currentPage.networkTraffic());
+    return this.current_command.sendResponse(this.currentPage.networkTraffic());
   };
 
   Browser.prototype.clear_network_traffic = function() {
     this.currentPage.clearNetworkTraffic();
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.get_headers = function() {
-    return this.sendResponse(this.currentPage.getCustomHeaders());
+    return this.current_command.sendResponse(this.currentPage.getCustomHeaders());
   };
 
   Browser.prototype.set_headers = function(headers) {
@@ -523,7 +548,7 @@ Poltergeist.Browser = (function() {
       this.currentPage.setUserAgent(headers['User-Agent']);
     }
     this.currentPage.setCustomHeaders(headers);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.add_headers = function(headers) {
@@ -544,46 +569,46 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.response_headers = function() {
-    return this.sendResponse(this.currentPage.responseHeaders());
+    return this.current_command.sendResponse(this.currentPage.responseHeaders());
   };
 
   Browser.prototype.cookies = function() {
-    return this.sendResponse(this.currentPage.cookies());
+    return this.current_command.sendResponse(this.currentPage.cookies());
   };
 
   Browser.prototype.set_cookie = function(cookie) {
     phantom.addCookie(cookie);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.remove_cookie = function(name) {
     this.currentPage.deleteCookie(name);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.clear_cookies = function() {
     phantom.clearCookies();
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.cookies_enabled = function(flag) {
     phantom.cookiesEnabled = flag;
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_http_auth = function(user, password) {
     this.currentPage.setHttpAuth(user, password);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_js_errors = function(value) {
     this.js_errors = value;
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_debug = function(value) {
     this._debug = value;
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.exit = function() {
@@ -597,48 +622,54 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.go_back = function() {
-    var _this = this;
+    var command;
+    command = this.current_command;
     if (this.currentPage.canGoBack) {
       this.currentPage.state = 'loading';
       this.currentPage.goBack();
-      return this.currentPage.waitState('default', function() {
-        return _this.sendResponse(true);
-      });
+      return this.currentPage.waitState('default', (function(_this) {
+        return function() {
+          return command.sendResponse(true);
+        };
+      })(this));
     } else {
-      return this.sendResponse(false);
+      return command.sendResponse(false);
     }
   };
 
   Browser.prototype.go_forward = function() {
-    var _this = this;
+    var command;
+    command = this.current_command;
     if (this.currentPage.canGoForward) {
       this.currentPage.state = 'loading';
       this.currentPage.goForward();
-      return this.currentPage.waitState('default', function() {
-        return _this.sendResponse(true);
-      });
+      return this.currentPage.waitState('default', (function(_this) {
+        return function() {
+          return command.sendResponse(true);
+        };
+      })(this));
     } else {
-      return this.sendResponse(false);
+      return command.sendResponse(false);
     }
   };
 
   Browser.prototype.set_url_blacklist = function() {
     this.currentPage.urlBlacklist = Array.prototype.slice.call(arguments);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_confirm_process = function(process) {
     this.confirm_processes.push(process);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_prompt_response = function(response) {
     this.prompt_responses.push(response);
-    return this.sendResponse(true);
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.modal_message = function() {
-    return this.sendResponse(this.processed_modal_messages.shift());
+    return this.current_command.sendResponse(this.processed_modal_messages.shift());
   };
 
   return Browser;