Merge lp:~abreu-alexandre/ubuntu-html5-theme/fix-toolbar-click-and-hide into lp:ubuntu-html5-theme

[Alexandre Abreu]

Fix issues with the toolbar buttons:
- make sure that we dont preventDefault() in all cases (even when the user tries to click()),
- make sure that the user's intent seems like hiding/showing before doing so,

Fix issues with the toolbar buttons:
- make sure that we dont preventDefault() in all cases (even when the user tries to click()),
- make sure that the user's intent seems like hiding/showing before doing so,

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/141/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/125
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4630
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4630/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/141/rebuild

review: Needs Fixing (continuous-integration)

=== modified file '0.1/ambiance/js/toolbars.js'
--- 0.1/ambiance/js/toolbars.js	2014-02-13 17:20:57 +0000
+++ 0.1/ambiance/js/toolbars.js	2014-04-04 12:22:09 +0000
@@ -133,8 +133,6 @@
         __onTouchStart: function (evt) {
             this._touchDown = true;
 
-            evt.preventDefault();
-
             this.phase = this.PHASE_START;
             var identifier = evt.identifier !== undefined ? evt.identifier : 0;
 
@@ -159,8 +157,6 @@
                 return;
 
             if (this.phase == this.PHASE_START) {
-                evt.preventDefault();
-
                 var touchEvent =
                     this._touchInfoDelegate.translateTouchEvent(evt);
 
@@ -170,8 +166,16 @@
                 f.end.x = touchEvent.touches[0].pageX;
                 f.end.y = touchEvent.touches[0].pageY;
 
+		// Validate that the movement has a big enough amplitude
+		// before considering it as a 'move'. The 0.4 is a value
+		// that was setup after some experimentation on touch.
+		var amplitude = this.__norm(f.start, f.end);
+		if ((amplitude / this.toolbar.offsetHeight) < 0.4)
+			return;
+
+                evt.preventDefault();
+
                 direction = this.__calculateDirection(f.start, f.end);
-
                 if (direction == "DOWN") {
                     this.hide();
                 }
@@ -203,6 +207,15 @@
         /**
          * @private
          */
+        __norm: function (p1, p2) {
+	    var vx = p2.x - p1.x;
+	    var vy = p2.y - p1.y;
+	    return Math.sqrt(vx * vx + vy * vy);
+	},
+
+        /**
+         * @private
+         */
         __calculateDirection: function (startPoint, endPoint) {
             var angle = this.__calculateAngle(startPoint, endPoint);