Merge branch 'MultiArch' of https://github.com/purplecabbage/cordova-windows
diff --git a/.travis.yml b/.travis.yml
index dcbeeda..d0be3b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@
git:
depth: 10
node_js:
- - "0.10"
- - "0.12"
- "4"
- "6"
install:
diff --git a/README.md b/README.md
index 0c22d7e..89b8d9a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
#
-->
-#Apache Cordova for Windows
+# Apache Cordova for Windows
[](https://ci.appveyor.com/project/Humbedooh/cordova-windows/branch/master)
[](https://travis-ci.org/apache/cordova-windows)
@@ -31,7 +31,7 @@
[Apache Cordova](http://cordova.apache.org) is a project of [The Apache Software Foundation (ASF)](http://apache.org)
-#Requirements
+# Requirements
### Windows 10, Windows 8.1, Windows Phone 8.1
Host OS: Windows 8.1 or Windows 10
@@ -44,7 +44,7 @@
Install the tools: [Visual Studio 2013 Express](http://www.visualstudio.com/downloads/download-visual-studio-vs#d-express-windows-8).
-#Getting started
+# Getting started
The best way to use this is to install the [Cordova CLI](https://www.npmjs.com/package/cordova), create a project, add the windows platform, and run the app:
npm install -g cordova
@@ -52,7 +52,7 @@
cordova platform add windows
cordova run windows
-#Getting logs from Windows Store applications
+# Getting logs from Windows Store applications
You can get your JavaScript logs as well as Windows logs related to your Windows Store application by running the following command from your app directory:
platforms\windows\cordova\log
@@ -65,9 +65,9 @@
Please note that the log command is supported only for Windows Store applications and cannot get logs from Windows Phone application.
-#Report Issues
+# Report Issues
Report them at the [Apache Cordova Issue Tracker](https://issues.apache.org/jira/browse/CB). Create a user account, use `windows` as the component.
-#Further Reading
+# Further Reading
- [Windows Platform Guide](http://cordova.apache.org/docs/en/edge/guide_platforms_win8_index.md.html#Windows%208%20Platform%20Guide)
- [Apache Cordova Documentation](http://docs.cordova.io)
diff --git a/appveyor.yml b/appveyor.yml
index b8d1fea..f32bed8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,8 +21,6 @@
environment:
matrix:
- - nodejs_version: "0.10"
- - nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "6"
diff --git a/cordova-js-src/splashscreen.js b/cordova-js-src/splashscreen.js
index 6fe918b..99b60d9 100644
--- a/cordova-js-src/splashscreen.js
+++ b/cordova-js-src/splashscreen.js
@@ -212,7 +212,7 @@
// Make title bg color match splashscreen bg color
function colorizeTitleBar() {
var appView = Windows.UI.ViewManagement.ApplicationView.getForCurrentView();
- if (appView.titleBar) {
+ if (isWin10UWP) {
titleInitialBgColor = appView.titleBar.backgroundColor;
appView.titleBar.backgroundColor = titleBgColor;
@@ -223,7 +223,7 @@
// Revert title bg color
function revertTitleBarColor() {
var appView = Windows.UI.ViewManagement.ApplicationView.getForCurrentView();
- if (appView.titleBar) {
+ if (isWin10UWP) {
appView.titleBar.backgroundColor = titleInitialBgColor;
appView.titleBar.buttonBackgroundColor = titleInitialBgColor;
}
diff --git a/node_modules/cordova-registry-mapper/README.md b/node_modules/cordova-registry-mapper/README.md
index 3b93e5f..841d02d 100644
--- a/node_modules/cordova-registry-mapper/README.md
+++ b/node_modules/cordova-registry-mapper/README.md
@@ -1,6 +1,6 @@
[](https://travis-ci.org/stevengill/cordova-registry-mapper)
-#Cordova Registry Mapper
+# Cordova Registry Mapper
This module is used to map Cordova plugin ids to package names and vice versa.
diff --git a/package.json b/package.json
index e73937c..d3ef3da 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,9 @@
"type": "git",
"url": "https://github.com/apache/cordova-windows"
},
+ "bugs": {
+ "url": "https://issues.apache.org/jira/browse/CB"
+ },
"keywords": [
"windows",
"cordova",
