Adding page and client X/Y to options objects.

This closes #7

Author: manolo

README.md

@@ -15,7 +15,7 @@ to move the image, shake your device and change the orientiation.
    ```
         <dependency>
             <groupId>com.googlecode.gwtquery.plugins</groupId>
-            <artifactId>gesture-plugin</artifactId>
+            <artifactId>gestures-plugin</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>

src/main/java/com/google/gwt/query/client/plugins/gestures/Gesture.java

@@ -506,6 +506,10 @@ else if (y < 0)
         .direction(_oDirection)
         .screenX(oOptions_.screenX())
         .screenY(oOptions_.screenY())
+        .pageX(oOptions_.pageX())
+        .pageY(oOptions_.pageY())
+        .clientX(oOptions_.clientX())
+        .clientY(oOptions_.clientY())
         .duration(oOptions_.duration() > 0 ? oOptions_.duration() : oOptions_.startMove().timestamp() > 0 ? _iNow - oOptions_.timestamp() : 0)
         .rotation(oOptions_.rotation())
         .scale(oOptions_.scale())
@@ -697,6 +701,8 @@ public boolean f(Event e) {
         _iFingers = _iFingers > 1 ? _iFingers : (_iLastFingers + _iFingers);
       }
 
+      console.log(_eventBase);
+
       _oObj.set("oLastSwipemove", GQ.create(Move.class).identifier(_eventBase.identifier()).screenX(_eventBase.screenX()).screenY(_eventBase.screenY()).timestamp(Duration.currentTimeMillis()).getDataImpl());
       _oObj.set("oStartTouch", GQ.create(Move.class).identifier(_eventBase.identifier()).screenX(_eventBase.screenX()).screenY(_eventBase.screenY()).timestamp(Duration.currentTimeMillis()).getDataImpl());
       _oObj.set("oMovement", GQ.create(Move.class).identifier(_eventBase.identifier()).screenX(_eventBase.screenX()).screenY(_eventBase.screenY()).top(_eventBase.screenY()).right(_eventBase.screenX()).bottom(_eventBase.screenY()).left(_eventBase.screenX()).getDataImpl());
@@ -810,6 +816,10 @@ public boolean f(Event e) {
       int _iTouches = (_bHasTouches) ? event_.changedTouches().length() : 1;
       int _iScreenX = (_bHasTouches) ? _eventBase.screenX() : event_.screenX();
       int _iScreenY = (_bHasTouches) ? _eventBase.screenY() : event_.screenY();
+      int _iPageX = (_bHasTouches) ? _eventBase.pageX() : event_.pageX();
+      int _iPageY = (_bHasTouches) ? _eventBase.pageY() : event_.pageY();
+      int _iClientX = (_bHasTouches) ? _eventBase.clientX() : event_.clientX();
+      int _iClientY = (_bHasTouches) ? _eventBase.clientY() : event_.clientY();
 
       // trigger custom notification
       _$element.trigger($.jGestures.events().touchendStart(),event_);
@@ -870,7 +880,7 @@ public boolean f(Event e) {
       // calculate distances in relation to the touchstart position not the last touchmove event!
       _iDeltaX = _iScreenX - _oEventData.screenX() ;
       _iDeltaY = _iScreenY - _oEventData.screenY();
-      _oDetails = _createOptions(GQ.create(OptArgs.class).type("swipe").touches(_iTouches).screenY(_iScreenY).screenX(_iScreenX).deltaY(_iDeltaY).deltaX(_iDeltaX).startMove(_oEventData).event(event_).timestamp(_oEventData.timestamp()));
+      _oDetails = _createOptions(GQ.create(OptArgs.class).type("swipe").touches(_iTouches).screenX(_iScreenX).screenY(_iScreenY).pageX(_iPageX).pageY(_iPageY).clientX(_iClientX).clientY(_iClientY).deltaX(_iDeltaX).deltaY(_iDeltaY).startMove(_oEventData).event(event_).timestamp(_oEventData.timestamp()));
 
       // trigger events for all bound pseudo events on this element
       for (String _sType : _oDatajQueryGestures.keys()) {

src/main/java/com/google/gwt/query/client/plugins/gestures/GestureObjects.java

@@ -148,6 +148,10 @@ public interface Move extends JsonBuilder {
       int vector();
       int screenX();
       int screenY();
+      int pageX();
+      int pageY();
+      int clientX();
+      int clientY();
       OptArgs type(String s);
       OptArgs touches(int i);
       OptArgs deltaY(int i);
@@ -159,6 +163,10 @@ public interface Move extends JsonBuilder {
       OptArgs vector(int i);
       OptArgs screenX(int i);
       OptArgs screenY(int i);
+      OptArgs pageX(int i);
+      OptArgs pageY(int i);
+      OptArgs clientX(int i);
+      OptArgs clientY(int i);
       double rotation();
       OptArgs rotation(double i);
       double scale();
@@ -221,6 +229,14 @@ public interface Direction extends JsonBuilder {
     int screenY();
     Options screenX(int i);
     Options screenY(int i);
+    int pageX();
+    int pageY();
+    Options pageX(int i);
+    Options pageY(int i);
+    Options clientX(int i);
+    Options clientY(int i);
+    int clientX();
+    int clientY();
   }
 
   public interface XYZ extends JsonBuilder {

src/main/java/com/google/gwt/query/client/plugins/gestures/TouchEvent.java

@@ -38,6 +38,14 @@ public native final int screenY() /*-{
     return this.screenY || 0;
   }-*/;
 
+  public native final int clientX() /*-{
+    return this.clientX || 0;
+  }-*/;
+
+  public native final int clientY() /*-{
+    return this.clientY || 0;
+  }-*/;
+
   public native final double scale() /*-{
     return this.scale || 0;
   }-*/;