cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject git commit: fixed issues with tests
Date Tue, 23 Apr 2013 20:45:18 GMT
Updated Branches:
  refs/heads/master 8d92da7df -> 0b9903992


fixed issues with tests


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

Branch: refs/heads/master
Commit: 0b9903992ee06d89355b74485e37707154294147
Parents: 8d92da7
Author: Steven Gill <stevengill97@gmail.com>
Authored: Tue Apr 23 13:45:14 2013 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Tue Apr 23 13:45:14 2013 -0700

----------------------------------------------------------------------
 platforms/blackberry.js |    4 ++--
 platforms/ios.js        |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0b990399/platforms/blackberry.js
----------------------------------------------------------------------
diff --git a/platforms/blackberry.js b/platforms/blackberry.js
index f189eb3..6da5b97 100644
--- a/platforms/blackberry.js
+++ b/platforms/blackberry.js
@@ -174,9 +174,9 @@ function pluginInstalled(plugin_et, project_dir) {
     if (!config_tag) {
         return false;
     }
-    var plugin_name = plugin_tag.attrib.name,
+    var plugin_name = config_tag.attrib.id,
         plugin_id = plugin_et._root.attrib['id'],
-        readfile = fs.readFileSync(path.resolve(project_dir, config_xml_filename), 'utf8');
    
+        readfile = fs.readFileSync(path.resolve(project_dir, 'config.xml'), 'utf8');    
     if ((readfile.match(new RegExp(plugin_name, "g")) != null) || (readfile.match(new RegExp(plugin_id,
"g")) != null)){
         return true;
     }

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0b990399/platforms/ios.js
----------------------------------------------------------------------
diff --git a/platforms/ios.js b/platforms/ios.js
index 78b38b7..9c49172 100644
--- a/platforms/ios.js
+++ b/platforms/ios.js
@@ -301,7 +301,7 @@ function pluginInstalled(plugin_et, config_path) {
     }
     var plugin_name = config_tag.attrib.name || config_tag.attrib.key,
         plugin_id = plugin_et._root.attrib['id'],
-        readfile = fs.readFileSync(path.resolve(project_dir, config_xml_filename), 'utf8');
+        readfile = fs.readFileSync(config_path, 'utf8');
     if ((readfile.match(new RegExp(plugin_name, "g")) != null) || (readfile.match(new RegExp(plugin_id,
"g")) != null)){
         return true;
     }


Mime
View raw message