node.js in poltergeist-0.5.0

- old
+ new

@@ -1,37 +1,33 @@
 var __slice = Array.prototype.slice, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 Poltergeist.Node = (function() {
   var name, _fn, _i, _len, _ref;
-  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'isVisible', 'position', 'trigger', 'parentId'];
+  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest'];
   function Node(page, id) {
     this.page = page;
     this.id = id;
   }
   Node.prototype.parent = function() {
     return new Poltergeist.Node(this.page, this.parentId());
   };
-  Node.prototype.isObsolete = function() {
-    return this.page.nodeCall(this.id, 'isObsolete');
-  };
   _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) : [];
-      if (this.isObsolete()) {
-        throw new Poltergeist.ObsoleteNode;
-      } else {
-        return this.page.nodeCall(this.id, name, arguments);
-      }
+      return this.page.nodeCall(this.id, name, arguments);
     };
   }, Node);
   for (_i = 0, _len = _ref.length; _i < _len; _i++) {
     name = _ref[_i];
     _fn(name);
   }
-  Node.prototype.scrollIntoView = function() {
-    var adjust, dimensions, document, pos, scroll, viewport;
+  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;
     pos = this.position();
     scroll = {
@@ -43,28 +39,41 @@
         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));
       }
     };
-    adjust('left', 'width');
-    adjust('top', 'height');
-    if (scroll.left !== dimensions.left || scroll.top !== dimensions.top) {
-      this.page.setScrollPosition(scroll);
-      pos = this.position();
+    if (scrollIntoView) {
+      adjust('left', 'width');
+      adjust('top', 'height');
+      if (scroll.left !== dimensions.left || scroll.top !== dimensions.top) {
+        this.page.setScrollPosition(scroll);
+        pos = this.position();
+      }
     }
-    return pos;
+    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 position;
-    position = this.scrollIntoView();
-    return this.page.sendEvent('click', position.left, position.top);
+    var pos, test;
+    pos = this.clickPosition();
+    test = this.clickTest(pos.x, pos.y);
+    if (test.status === 'success') {
+      return this.page.sendEvent('click', pos.x, pos.y);
+    } else {
+      throw new Poltergeist.ClickFailed(test.selector, pos);
+    }
   };
   Node.prototype.dragTo = function(other) {
     var otherPosition, position;
-    position = this.scrollIntoView();
-    otherPosition = other.position();
-    this.page.sendEvent('mousedown', position.left, position.top);
-    this.page.sendEvent('mousemove', otherPosition.left, otherPosition.top);
-    return this.page.sendEvent('mouseup', otherPosition.left, otherPosition.top);
+    position = this.clickPosition();
+    otherPosition = other.clickPosition(false);
+    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);
   };
   return Node;
 }).call(this);
\ No newline at end of file