[04/16] git commit: [WP8] add all files from www dir in actual project directory, not the common one (required in order to respect files from merges)

[st...@apache.org]

[WP8] add all files from www dir in actual project directory, not the common one (required in order to respect files from merges)


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/fd8b2f15
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/fd8b2f15
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/fd8b2f15

Branch: refs/heads/ffos
Commit: fd8b2f151232ffb1d2fe16548d728d78184e75e2
Parents: 443e8eb
Author: Wolfgang Koller <vi...@apache.org>
Authored: Sun Sep 1 11:32:29 2013 +0200
Committer: Wolfgang Koller <vi...@apache.org>
Committed: Sun Sep 1 11:32:29 2013 +0200

----------------------------------------------------------------------
 src/metadata/wp8_parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/fd8b2f15/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index 4a4633f..dad5605 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -192,7 +192,7 @@ module.exports.prototype = {
 
         // now add all www references back in from the root www folder
         var project_root = util.isCordova(this.wp8_proj_dir);
-        var www_files = this.folder_contents('www', util.projectWww(project_root));
+        var www_files = this.folder_contents('www', this.www_dir());
         for(file in www_files) {
             var item = new et.Element('ItemGroup');
             var content = new et.Element('Content');