no need for scrollIntoView param

twe4ked · Jul 11, 2012 · 9de1a61 · 9de1a61
1 parent cb5ecaf
commit 9de1a61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/lib/capybara/poltergeist/client/compiled/node.js b/lib/capybara/poltergeist/client/compiled/node.js
@@ -28,14 +28,8 @@ Poltergeist.Node = (function() {
     _fn(name);
   }
 
-  Node.prototype.clickPosition = function(scrollIntoView) {
+  Node.prototype.clickPosition = function() {
     var middle, pos, viewport;
-    if (scrollIntoView == null) {
-      scrollIntoView = true;
-    }
-    if (scrollIntoView) {
-      this.scrollIntoView();
-    }
     viewport = this.page.viewportSize();
     pos = this.position();
     middle = function(start, end, size) {
@@ -49,6 +43,7 @@ Poltergeist.Node = (function() {
 
   Node.prototype.click = function() {
     var pos, test;
+    this.scrollIntoView();
     pos = this.clickPosition();
     test = this.clickTest(pos.x, pos.y);
     if (test.status === 'success') {
@@ -60,8 +55,9 @@ Poltergeist.Node = (function() {
 
   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);

diff --git a/lib/capybara/poltergeist/client/node.coffee b/lib/capybara/poltergeist/client/node.coffee
@@ -15,10 +15,7 @@ class Poltergeist.Node
       this.prototype[name] = (args...) ->
         @page.nodeCall(@id, name, args)
 
-  clickPosition: (scrollIntoView = true) ->
-    if scrollIntoView
-      this.scrollIntoView()
-
+  clickPosition: ->
     viewport = @page.viewportSize()
     pos      = this.position()
 
@@ -31,6 +28,8 @@ class Poltergeist.Node
     }
 
   click: ->
+    this.scrollIntoView()
+
     pos  = this.clickPosition()
     test = this.clickTest(pos.x, pos.y)
 
@@ -40,8 +39,10 @@ class Poltergeist.Node
       throw new Poltergeist.ClickFailed(test.selector, pos)
 
   dragTo: (other) ->
+    this.scrollIntoView()
+
     position      = this.clickPosition()
-    otherPosition = other.clickPosition(false)
+    otherPosition = other.clickPosition()
 
     @page.sendEvent('mousedown', position.x,      position.y)
     @page.sendEvent('mousemove', otherPosition.x, otherPosition.y)