Merge branch 'CB-7616' of https://github.com/MSOpenTech/cordova-wp8
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9e92c10..e57a790 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,7 +25,19 @@
Cordova is a static library that enables developers to include the Cordova API in their WP8 application projects easily, and also create new Cordova-based WP8 application projects through the command-line.
-### 3.6.0 (September 2, 2015) ###
+### 3.6.4 (September 30, 2014) ###
+
+* Updated JS snapshot + set version to 3.6.4
+* CB-7616 partial match support for --target
+* CB-7616 Deploy on WP8 fails to run specific target
+* Fixing paths for npm published versions
+* cleanup ignores and add missing windows cmd files, if you want to add a bundledDependency node_module use -f
+* move node_modules up same level as package.json
+* CB-7455 add bundledDependencies
+* Moves node_modules from package root to bin/ folder
+* CB-7444 Fixes XHR callback failure when requested file doesn't exists
+
+### 3.6.0 (September 2, 2014) ###
* updated package.json
* Update 3.6.x branch
diff --git a/appveyor.yml b/appveyor.yml
index bf5b442..bd55765 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
# appveyor file
# http://www.appveyor.com/docs/appveyor-yml
diff --git a/template/cordovalib/BrowserMouseHelper.cs b/template/cordovalib/BrowserMouseHelper.cs
index fc83e03..059bec8 100644
--- a/template/cordovalib/BrowserMouseHelper.cs
+++ b/template/cordovalib/BrowserMouseHelper.cs
@@ -145,7 +145,7 @@
{
//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)
diff --git a/template/cordovalib/CordovaView.xaml.cs b/template/cordovalib/CordovaView.xaml.cs
index 0514aa6..5e790a3 100644
--- a/template/cordovalib/CordovaView.xaml.cs
+++ b/template/cordovalib/CordovaView.xaml.cs
@@ -196,6 +196,19 @@
Debug.WriteLine("Unable to parse BackgroundColor value '{0}'. Error: {1}", bgColor, ex.Message);
}
}
+
+ string disallowOverscroll = configHandler.GetPreference("disallowoverscroll");
+ if (!String.IsNullOrEmpty(disallowOverscroll))
+ {
+ try
+ {
+ this.DisableBouncyScrolling = bool.Parse(disallowOverscroll);
+ }
+ catch (Exception ex)
+ {
+ Debug.WriteLine("Unable to parse DisallowOverscroll value '{0}'. Error: {1}", disallowOverscroll, ex.Message);
+ }
+ }
}
/*
