You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/05/07 18:28:48 UTC

[1/2] incubator-guacamole-client git commit: GUACAMOLE-294: Fix an incorrectly positioned bracket.

Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 0bec63219 -> 5f1927166


GUACAMOLE-294: Fix an incorrectly positioned bracket.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/635035ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/635035ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/635035ec

Branch: refs/heads/master
Commit: 635035ec34a4380684f8d9c9e8d726ad20390aa6
Parents: 7fd7035
Author: Chris Gavin <ch...@chrisgavin.me>
Authored: Sun May 7 11:08:11 2017 +0100
Committer: Chris Gavin <ch...@chrisgavin.me>
Committed: Sun May 7 19:04:01 2017 +0100

----------------------------------------------------------------------
 guacamole/src/main/webapp/app/touch/directives/guacTouchDrag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/635035ec/guacamole/src/main/webapp/app/touch/directives/guacTouchDrag.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/touch/directives/guacTouchDrag.js b/guacamole/src/main/webapp/app/touch/directives/guacTouchDrag.js
index ff38797..ffde35c 100644
--- a/guacamole/src/main/webapp/app/touch/directives/guacTouchDrag.js
+++ b/guacamole/src/main/webapp/app/touch/directives/guacTouchDrag.js
@@ -168,7 +168,7 @@ angular.module('touch').directive('guacTouchDrag', [function guacTouchDrag() {
                     // Signal end of drag gesture
                     if (inProgress && guacTouchDrag) {
                         $scope.$apply(function dragComplete() {
-                            if (guacTouchDrag(true, startX, startY, currentX, currentY, deltaX, deltaY === false))
+                            if (guacTouchDrag(true, startX, startY, currentX, currentY, deltaX, deltaY) === false)
                                 e.preventDefault();
                         });
                     }


[2/2] incubator-guacamole-client git commit: GUACAMOLE-294: Merge fix for typo in guacTouchDrag() return value check.

Posted by mj...@apache.org.
GUACAMOLE-294: Merge fix for typo in guacTouchDrag() return value check.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5f192716
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5f192716
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5f192716

Branch: refs/heads/master
Commit: 5f19271665b7520ec12ade70bd0a070eb5c76149
Parents: 0bec632 635035e
Author: Michael Jumper <mj...@apache.org>
Authored: Sun May 7 11:18:48 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun May 7 11:18:48 2017 -0700

----------------------------------------------------------------------
 guacamole/src/main/webapp/app/touch/directives/guacTouchDrag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------