cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhigg...@apache.org
Subject [1/2] webworks commit: CB-6326 (cordova-blackberry) target-utils.js
Date Mon, 24 Mar 2014 02:55:15 GMT
Repository: cordova-blackberry
Updated Branches:
  refs/heads/master b2e8672e4 -> 7b563950c


CB-6326 (cordova-blackberry) target-utils.js

https://issues.apache.org/jira/browse/CB-6326

target-utils.js file has been updated,
simulator replaced by emulator.


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

Branch: refs/heads/master
Commit: 15c70d7a8f3d5293f977ec6d81abb0dcbfa8952a
Parents: b2e8672
Author: Martin Gonzalez <martin.c.glez.glez@gmail.com>
Authored: Fri Mar 21 11:46:49 2014 -0600
Committer: Martin Gonzalez <martin.c.glez.glez@gmail.com>
Committed: Fri Mar 21 11:46:49 2014 -0600

----------------------------------------------------------------------
 .../bin/templates/project/cordova/lib/target-utils.js        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/15c70d7a/blackberry10/bin/templates/project/cordova/lib/target-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/target-utils.js b/blackberry10/bin/templates/project/cordova/lib/target-utils.js
index 4c070bb..b54c244 100644
--- a/blackberry10/bin/templates/project/cordova/lib/target-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/target-utils.js
@@ -167,7 +167,7 @@ _self = {
         // Firstly, check targets in the properties file
         if (targets) {
             for (t in targets) {
-                if (targets.hasOwnProperty(t) && targets[t].type === "simulator"
&& targets[t].ip) {
+                if (targets.hasOwnProperty(t) && targets[t].type === "emulator" &&
targets[t].ip) {
                     ipsToTest.push(targets[t].ip);
                 }
             }
@@ -216,7 +216,7 @@ _self = {
 
         console.log("Searching for connected BlackBerry 10 Simulator (" + (index + 1) + "/"
+ ips.length + ")...");
         ip = ips[index];
-        _self.checkConnection(ip, "simulator", function (connection) {
+        _self.checkConnection(ip, "emulator", function (connection) {
             if (connection) {
                 callback(ip);
             } else {
@@ -236,8 +236,8 @@ _self = {
             };
 
         bb10_utils.exec(script, args, options, function (error, stdout, stderr) {
-            // error code 3 corresponds to a connected device, null or "Error: null" in stderr
corresponds to connected simulator
-            var isSimConnected = (type === "simulator" && (
+            // error code 3 corresponds to a connected device, null or "Error: null" in stderr
corresponds to connected emulator
+            var isSimConnected = (type === "emulator" && (
                     error === null ||
                     stderr.length === 0 ||
                     stderr.indexOf('Error: null') >= 0 ||


Mime
View raw message