node.js in poltergeist-0.7.0

- old
+ new
@@ -1,79 +1,72 @@
-var __slice = Array.prototype.slice, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+var __slice = [].slice;
+
 Poltergeist.Node = (function() {
-  var name, _fn, _i, _len, _ref;
-  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest'];
+  var name, _fn, _i, _len, _ref,
+    _this = this;
+
+  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest', 'scrollIntoView', 'isDOMEqual'];
+
   function Node(page, id) {
     this.page = page;
     this.id = id;
   }
+
   Node.prototype.parent = function() {
     return new Poltergeist.Node(this.page, this.parentId());
   };
+
   _ref = Node.DELEGATES;
-  _fn = __bind(function(name) {
-    return this.prototype[name] = function() {
-      var arguments, _ref2;
-      _ref2 = arguments, arguments = 1 <= _ref2.length ? __slice.call(_ref2, 0) : [];
-      return this.page.nodeCall(this.id, name, arguments);
+  _fn = function(name) {
+    return Node.prototype[name] = function() {
+      var args;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return this.page.nodeCall(this.id, name, args);
     };
-  }, Node);
+  };
   for (_i = 0, _len = _ref.length; _i < _len; _i++) {
     name = _ref[_i];
     _fn(name);
   }
-  Node.prototype.clickPosition = function(scrollIntoView) {
-    var adjust, dimensions, document, middle, pos, scroll, viewport;
-    if (scrollIntoView == null) {
-      scrollIntoView = true;
-    }
-    dimensions = this.page.validatedDimensions();
-    document = dimensions.document;
-    viewport = dimensions.viewport;
+
+  Node.prototype.clickPosition = function() {
+    var middle, pos, viewport;
+    viewport = this.page.viewportSize();
     pos = this.position();
-    scroll = {
-      left: dimensions.left,
-      top: dimensions.top
-    };
-    adjust = function(coord, measurement) {
-      if (pos[coord] < 0) {
-        return scroll[coord] = Math.max(0, scroll[coord] + pos[coord] - (viewport[measurement] / 2));
-      } else if (pos[coord] >= viewport[measurement]) {
-        return scroll[coord] = Math.min(document[measurement] - viewport[measurement], scroll[coord] + pos[coord] - viewport[measurement] + (viewport[measurement] / 2));
-      }
-    };
-    if (scrollIntoView) {
-      adjust('left', 'width');
-      adjust('top', 'height');
-      if (scroll.left !== dimensions.left || scroll.top !== dimensions.top) {
-        this.page.setScrollPosition(scroll);
-        pos = this.position();
-      }
-    }
     middle = function(start, end, size) {
       return start + ((Math.min(end, size) - start) / 2);
     };
     return {
       x: middle(pos.left, pos.right, viewport.width),
       y: middle(pos.top, pos.bottom, viewport.height)
     };
   };
+
   Node.prototype.click = function() {
     var pos, test;
+    this.scrollIntoView();
     pos = this.clickPosition();
     test = this.clickTest(pos.x, pos.y);
     if (test.status === 'success') {
       return this.page.sendEvent('click', pos.x, pos.y);
     } else {
-      return new Poltergeist.ClickFailed(test.selector, pos);
+      throw new Poltergeist.ClickFailed(test.selector, pos);
     }
   };
+
   Node.prototype.dragTo = function(other) {
     var otherPosition, position;
+    this.scrollIntoView();
     position = this.clickPosition();
-    otherPosition = other.clickPosition(false);
+    otherPosition = other.clickPosition();
     this.page.sendEvent('mousedown', position.x, position.y);
     this.page.sendEvent('mousemove', otherPosition.x, otherPosition.y);
     return this.page.sendEvent('mouseup', otherPosition.x, otherPosition.y);
   };
+
+  Node.prototype.isEqual = function(other) {
+    return this.page === other.page && this.isDOMEqual(other.id);
+  };
+
   return Node;
-}).call(this);
\ No newline at end of file
+
+}).call(this);