cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [5/7] js commit: Checking for windows style path
Date Tue, 26 Aug 2014 18:07:48 GMT
Checking for windows style path


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

Branch: refs/heads/master
Commit: de45d81a84b3b528baad4c14f9d8c9ddb9c8f2bd
Parents: 4ccaed2
Author: Suraj Pindoria <suraj.pindoria@yahoo.com>
Authored: Fri Aug 22 14:08:24 2014 -0700
Committer: Suraj Pindoria <suraj.pindoria@yahoo.com>
Committed: Fri Aug 22 14:08:24 2014 -0700

----------------------------------------------------------------------
 tasks/lib/require-tr.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/de45d81a/tasks/lib/require-tr.js
----------------------------------------------------------------------
diff --git a/tasks/lib/require-tr.js b/tasks/lib/require-tr.js
index 87fe55a..ed0e95d 100644
--- a/tasks/lib/require-tr.js
+++ b/tasks/lib/require-tr.js
@@ -48,10 +48,10 @@ var requireTr = {
         // Checking for '\' from the windows path
         root = root.replace(/\\/g, '/');
 
-        if(file.match(/android\/platform.js$/)) {
+        if(file.match(/android\/platform.js$/) || file.match(/android\\platform.js$/)) {
           data = data.replace(/modulemapper\.clobbers.*\n/,
                               util.format('navigator.app = require("%s/src/android/plugin/android/app")',
root));
-        } else if (file.match(/amazon-fireos\/platform.js$/)) {
+        } else if (file.match(/amazon-fireos\/platform.js$/) || file.match(/amazon-fireos\\platform.js$/))
{
           data = data.replace(/modulemapper\.clobbers.*\n/,
                               util.format('navigator.app = require("%s/src/amazon-fireos/plugin/android/app")',
root));
         }


Mime
View raw message