You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/09/30 01:37:47 UTC
git commit: factored out common code
Repository: cordova-wp8
Updated Branches:
refs/heads/master 07b0b418c -> 7fdff991f
factored out common code
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/7fdff991
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/7fdff991
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/7fdff991
Branch: refs/heads/master
Commit: 7fdff991f4ce148c09d6687dfc6ea269b1cb732f
Parents: 07b0b41
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Sep 29 16:37:05 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Sep 29 16:37:05 2014 -0700
----------------------------------------------------------------------
template/cordovalib/BrowserMouseHelper.cs | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/7fdff991/template/cordovalib/BrowserMouseHelper.cs
----------------------------------------------------------------------
diff --git a/template/cordovalib/BrowserMouseHelper.cs b/template/cordovalib/BrowserMouseHelper.cs
index 49b982b..059bec8 100644
--- a/template/cordovalib/BrowserMouseHelper.cs
+++ b/template/cordovalib/BrowserMouseHelper.cs
@@ -145,7 +145,7 @@ namespace WPCordovaClassLib
{
//Debug.WriteLine("Border_ManipulationCompleted");
// suppress zoom
- if (!userScalable && e.FinalVelocities != null)
+ if (ScrollDisabled || ( !userScalable && e.FinalVelocities != null) )
{
if (e.FinalVelocities.ExpansionVelocity.X != 0.0 ||
e.FinalVelocities.ExpansionVelocity.Y != 0.0)
@@ -153,15 +153,6 @@ namespace WPCordovaClassLib
e.Handled = true;
}
}
-
- if (ScrollDisabled)
- {
- if (e.FinalVelocities.LinearVelocity.X != 0.0 ||
- e.FinalVelocities.LinearVelocity.Y != 0.0)
- {
- e.Handled = true;
- }
- }
}