cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgreb...@apache.org
Subject git commit: CB-7416 Fixes file path reference when adding new source file
Date Thu, 28 Aug 2014 09:06:38 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master d073358cd -> 2ac042e94


CB-7416 Fixes file path reference when adding new source file


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

Branch: refs/heads/master
Commit: 2ac042e94a1bfb989ceffe123d1e0ebab9ee6367
Parents: d073358
Author: sgrebnov <v-segreb@microsoft.com>
Authored: Thu Aug 28 13:05:50 2014 +0400
Committer: sgrebnov <v-segreb@microsoft.com>
Committed: Thu Aug 28 13:05:50 2014 +0400

----------------------------------------------------------------------
 cordova-lib/src/plugman/platforms/windows.js | 2 +-
 cordova-lib/src/util/windows/jsproj.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2ac042e9/cordova-lib/src/plugman/platforms/windows.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/windows.js b/cordova-lib/src/plugman/platforms/windows.js
index c8e1511..dc5089f 100644
--- a/cordova-lib/src/plugman/platforms/windows.js
+++ b/cordova-lib/src/plugman/platforms/windows.js
@@ -69,7 +69,7 @@ module.exports = {
         },
         uninstall:function(source_el, project_dir, plugin_id, project_file) {
             var dest = path.join('www', 'plugins', plugin_id,
-                                 source_el.attrib['target-dir'] ? source_el.attrib['target-dir']
: '',
+                                 source_el.attrib['target-dir'] || '',
                                  path.basename(source_el.attrib['src']));
             common.removeFile(project_dir, dest);
             // remove reference to this file from csproj.

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2ac042e9/cordova-lib/src/util/windows/jsproj.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/util/windows/jsproj.js b/cordova-lib/src/util/windows/jsproj.js
index d847603..a20fe7f 100644
--- a/cordova-lib/src/util/windows/jsproj.js
+++ b/cordova-lib/src/util/windows/jsproj.js
@@ -131,10 +131,10 @@ jsproj.prototype = {
         }
         // make ItemGroup to hold file.
         var item = new et.Element('ItemGroup');
-
+        var me = this;
         relative_path.forEach(function(filePath) {
             filePath = filePath.split('/').join('\\');
-            filePath = this.isUniversalWindowsApp ? '$(MSBuildThisFileDirectory)' + filePath
: filePath;
+            filePath = me.isUniversalWindowsApp ? '$(MSBuildThisFileDirectory)' + filePath
: filePath;
 
             var content = new et.Element('Content');
             content.attrib.Include = filePath;


Mime
View raw message