factored out common code

apache · Sep 29, 2014 · 7fdff991f4ce148c09d6687dfc6ea269b1cb732f · sgrebnov · Sep 30, 2014 · 7fdff99
1 parent 07b0b41
commit 7fdff991f4ce148c09d6687dfc6ea269b1cb732f
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/template/cordovalib/BrowserMouseHelper.cs b/template/cordovalib/BrowserMouseHelper.cs
@@ -145,23 +145,14 @@ private void Border_ManipulationCompleted(object sender, ManipulationCompletedEv
         {
             //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)
                 {
                     e.Handled = true;
                 }
             }
-
-            if (ScrollDisabled)
-            {
-                if (e.FinalVelocities.LinearVelocity.X != 0.0 ||
-                   e.FinalVelocities.LinearVelocity.Y != 0.0)
-                {
-                    e.Handled = true;
-                }
-            }
         }