You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2013/12/10 22:21:37 UTC
webworks commit: Fix jshint errors
Updated Branches:
refs/heads/master ce7df9913 -> 363f611c0
Fix jshint errors
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/363f611c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/363f611c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/363f611c
Branch: refs/heads/master
Commit: 363f611c019a88c3a0fc57b4fd5e46655acd6093
Parents: ce7df99
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Tue Dec 10 16:22:27 2013 -0500
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue Dec 10 16:22:27 2013 -0500
----------------------------------------------------------------------
blackberry10/.jshintignore | 6 ++
blackberry10/.jshintrc | 73 ++++++++++++++++++++
blackberry10/Jakefile | 10 ++-
blackberry10/bin/lib/target.js | 21 +++---
blackberry10/bin/lib/update.js | 36 +++++-----
blackberry10/bin/lib/utils.js | 33 +++++----
.../project/cordova/lib/bb10-ndk-version.js | 13 ++--
.../bin/templates/project/cordova/lib/build.js | 10 +--
.../bin/templates/project/cordova/lib/clean.js | 3 +-
.../project/cordova/lib/config-parser.js | 6 +-
.../project/cordova/lib/debugtoken-helper.js | 4 +-
.../project/cordova/lib/file-manager.js | 20 +++---
.../project/cordova/lib/native-packager.js | 2 +-
.../project/cordova/lib/packager-utils.js | 4 +-
.../project/cordova/lib/packager-validator.js | 1 +
.../templates/project/cordova/lib/packager.js | 2 +-
.../templates/project/cordova/lib/run-utils.js | 17 ++---
.../bin/templates/project/cordova/lib/run.js | 4 +-
.../templates/project/cordova/lib/session.js | 7 +-
.../project/cordova/lib/target-utils.js | 2 +
.../templates/project/cordova/lib/version.js | 10 +--
.../bin/test/cordova/integration/target.js | 6 +-
.../test/cordova/unit/spec/lib/signing-utils.js | 2 +-
.../cordova/unit/spec/lib/test-utilities.js | 3 +-
blackberry10/framework/lib/PluginResult.js | 2 +-
25 files changed, 201 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/.jshintignore
----------------------------------------------------------------------
diff --git a/blackberry10/.jshintignore b/blackberry10/.jshintignore
index 6bb2b92..0c74354 100644
--- a/blackberry10/.jshintignore
+++ b/blackberry10/.jshintignore
@@ -1 +1,7 @@
+framework/lib/jnext.js
bin/test/cordova/unit/params-bad.json
+bin/templates/project/cordova/lib/xml-helpers.js
+bin/templates/project/cordova/third_party/*
+bin/templates/project/lib/*
+bin/templates/project/cordova/lib/utils.js
+bin/templates/project/cordova/lib/signing-utils.js
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/.jshintrc
----------------------------------------------------------------------
diff --git a/blackberry10/.jshintrc b/blackberry10/.jshintrc
new file mode 100644
index 0000000..84db82c
--- /dev/null
+++ b/blackberry10/.jshintrc
@@ -0,0 +1,73 @@
+{
+ "predef": [
+ "escape",
+ "unescape",
+ //Jasmine
+ "jasmine",
+ "it",
+ "describe",
+ "xit",
+ "xdescribe",
+ "beforeEach",
+ "afterEach",
+ "runs",
+ "waits",
+ "waitsFor",
+ "spyOn",
+ "expect",
+ "global",
+ //Webworks
+ "qnx",
+ "chrome",
+ "blackberry",
+ "internal",
+ "JNEXT",
+ "frameworkModules",
+ //Node
+ "__dirname",
+ "GLOBAL",
+ "process",
+ "exports",
+ "module",
+ "NamedNodeMap",
+ "require",
+ "Node",
+ "JSZip",
+ //UI Components
+ "x$",
+ "iris",
+ //Browser
+ "DOMElement",
+ "atob",
+ //automated tests
+ "showOverlay",
+ "hideOverlay"
+ ],
+
+ "node" : false,
+ "browser" : true,
+
+ "boss" : false,
+ "curly": false,
+ "bitwise" : false,
+ "white": true,
+ "indent": 4,
+ "evil": false,
+ "devel": true,
+ "debug": false,
+ "eqeqeq": true,
+ "forin": true,
+ "immed": true,
+ "laxbreak": false,
+ "newcap": true,
+ "noarg": true,
+ "noempty": false,
+ "nonew": false,
+ "nomen": false,
+ "onevar": true,
+ "plusplus": false,
+ "regexp": false,
+ "undef": true,
+ "sub": true,
+ "strict": false
+}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/Jakefile
----------------------------------------------------------------------
diff --git a/blackberry10/Jakefile b/blackberry10/Jakefile
index eb72dbd..1336e9a 100644
--- a/blackberry10/Jakefile
+++ b/blackberry10/Jakefile
@@ -88,9 +88,17 @@ task('hint', ['complainwhitespace'], function () {
return wut;
};
- childProcess.exec("jshint framework/lib bin/lib bin/test bin/templates/project/cordova bin/templates/project/project.json --config .jshint --extra-ext .json",function(err,stdout,stderr) {
+ childProcess.exec("jshint framework/lib bin/lib bin/test bin/templates/project/cordova bin/templates/project/project.json --config .jshintrc --extra-ext .json",function(err,stdout,stderr) {
var exs = stdout.split('\n');
console.log(exs.filter(filterKnownWarnings).join('\n'));
+ if (err) {
+ console.log(err);
+ }
+ if (exs.length > 1) {
+ console.log("EXITING: " + exs.length);
+ process.exit(exs.length - 1);
+ }
+ console.log("jshint SUCCESS");
complete();
});
}, true);
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/lib/target.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/target.js b/blackberry10/bin/lib/target.js
index 5112c19..206e8c0 100644
--- a/blackberry10/bin/lib/target.js
+++ b/blackberry10/bin/lib/target.js
@@ -24,7 +24,7 @@ var path = require('path'),
ERROR_VALUE = 2,
NOTIMPLEMENTED_VALUE = 1,
command,
- name,
+ targetName,
ip,
type,
password,
@@ -101,7 +101,7 @@ commander
console.log(commander.helpInformation());
exit(ERROR_VALUE);
}
- name = commander.args[0];
+ targetName = commander.args[0];
ip = commander.args[1];
type = commander.type ? commander.type : "device";
if (commander.password && typeof commander.password === 'string') {
@@ -125,10 +125,10 @@ commander
console.log(commander.helpInformation());
exit(ERROR_VALUE);
}
- if (properties.targets.hasOwnProperty(name)) {
- console.log("Overwriting target: " + name);
+ if (properties.targets.hasOwnProperty(targetName)) {
+ console.log("Overwriting target: " + targetName);
}
- properties.targets[name] = {"ip": ip, "type": type, "password": password, "pin": pin};
+ properties.targets[targetName] = {"ip": ip, "type": type, "password": password, "pin": pin};
});
commander
@@ -140,13 +140,13 @@ commander
console.log(commander.helpInformation());
exit(ERROR_VALUE);
}
- name = commander.args[0];
- if (!properties.targets.hasOwnProperty(name)) {
- console.log("Target: '" + name + "' not found");
+ targetName = commander.args[0];
+ if (!properties.targets.hasOwnProperty(targetName)) {
+ console.log("Target: '" + targetName + "' not found");
console.log(commander.helpInformation());
exit(ERROR_VALUE);
}
- delete properties.targets[name];
+ delete properties.targets[targetName];
});
commander
@@ -164,7 +164,8 @@ try {
if (commander.args.length === 0) {
Object.keys(properties.targets).forEach(function (target) {
console.log(target);
- });
+ }
+ );
exit();
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/lib/update.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/update.js b/blackberry10/bin/lib/update.js
index 79786c9..52363bd 100755
--- a/blackberry10/bin/lib/update.js
+++ b/blackberry10/bin/lib/update.js
@@ -34,47 +34,47 @@ function setShellFatal(value, func) {
function updateNativeDir(projectpath) {
- shell.cp('-rf', path.join(ROOT,'bin','templates','project','native'), path.join(projectpath,'native'));
+ shell.cp('-rf', path.join(ROOT, 'bin', 'templates', 'project', 'native'), path.join(projectpath, 'native'));
}
function updateProjectJson(projectpath) {
var projectJson = require(path.resolve(path.join(projectpath, "project.json")));
- projectJson.globalFetchDir = path.join(ROOT,'plugins');
+ projectJson.globalFetchDir = path.join(ROOT, 'plugins');
fs.writeFileSync(path.join(projectpath, "project.json"), JSON.stringify(projectJson, null, 4) + "\n", "utf-8");
}
-function updateCordovaJS(projectpath,version) {
- var jspath = path.join(projectpath,'lib','cordova'+version,'javascript');
+function updateCordovaJS(projectpath, version) {
+ var jspath = path.join(projectpath, 'lib', 'cordova' + version, 'javascript');
shell.rm('-rf', path.join(projectpath, 'lib')); //remove old lib tree
shell.mkdir('-p', jspath); // remake lib dir tree with updated version
- shell.cp('-f', path.join(ROOT,'javascript','cordova.blackberry10.js'), path.join(jspath,'cordova.js')); // copy new js
- shell.cp('-f', path.join(ROOT,'javascript','cordova.blackberry10.js'), path.join('www','cordova.js'));
+ shell.cp('-f', path.join(ROOT, 'javascript', 'cordova.blackberry10.js'), path.join(jspath, 'cordova.js')); // copy new js
+ shell.cp('-f', path.join(ROOT, 'javascript', 'cordova.blackberry10.js'), path.join('www', 'cordova.js'));
}
function updateCordovaTools(projectpath) {
// update cordova scripts from template
- shell.cp('-rf', path.join(ROOT,'bin','templates','project','cordova'), path.join(projectpath,'cordova'));
+ shell.cp('-rf', path.join(ROOT, 'bin', 'templates', 'project', 'cordova'), path.join(projectpath, 'cordova'));
// update repo level scripts
updateTargetTool(projectpath);
updateInitTool(projectpath);
}
function updateTargetTool(projectpath) {
- shell.cp('-f', path.join(ROOT,'bin','target'), path.join(projectpath,'cordova'));
- shell.cp('-f', path.join(ROOT,'bin','target.bat'), path.join(projectpath,'cordova'));
- shell.cp('-f', path.join(ROOT,'bin','lib','target.js'), path.join(projectpath,'cordova','lib'));
- shell.cp('-f', path.join(ROOT,'bin','lib','utils.js'), path.join(projectpath,'cordova','lib'));
+ shell.cp('-f', path.join(ROOT, 'bin', 'target'), path.join(projectpath, 'cordova'));
+ shell.cp('-f', path.join(ROOT, 'bin', 'target.bat'), path.join(projectpath, 'cordova'));
+ shell.cp('-f', path.join(ROOT, 'bin', 'lib', 'target.js'), path.join(projectpath, 'cordova', 'lib'));
+ shell.cp('-f', path.join(ROOT, 'bin', 'lib', 'utils.js'), path.join(projectpath, 'cordova', 'lib'));
}
function updateInitTool(projectpath) {
- shell.cp('-f', path.join(ROOT,'bin','init.bat'), path.join(projectpath, 'cordova'));
- shell.cp('-f', path.join(ROOT,'bin','init'), path.join(projectpath, 'cordova'));
+ shell.cp('-f', path.join(ROOT, 'bin', 'init.bat'), path.join(projectpath, 'cordova'));
+ shell.cp('-f', path.join(ROOT, 'bin', 'init'), path.join(projectpath, 'cordova'));
}
-exports.updateProject = function(projectpath) {
+exports.updateProject = function (projectpath) {
var version = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim();
- setShellFatal(true, function() {
- updateCordovaJS(projectpath,version);
+ setShellFatal(true, function () {
+ updateCordovaJS(projectpath, version);
updateCordovaTools(projectpath);
updateNativeDir(projectpath);
updateProjectJson(projectpath);
@@ -83,9 +83,9 @@ exports.updateProject = function(projectpath) {
};
if (require.main === module) {
- (function() {
+ (function () {
var args = process.argv;
- if (args.length < 3 || (args[2] == '--help' || args[2] == '-h')) {
+ if (args.length < 3 || (args[2] === '--help' || args[2] === '-h')) {
console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'update')) + ' <path_to_project>');
exit(1);
} else {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/lib/utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/utils.js b/blackberry10/bin/lib/utils.js
index f4b2e6b..432ab42 100644
--- a/blackberry10/bin/lib/utils.js
+++ b/blackberry10/bin/lib/utils.js
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+/* globals Buffer */
+
var fs = require('fs'),
exit = require('exit'),
async = require('async'),
@@ -22,7 +24,7 @@ var fs = require('fs'),
wrench = require('wrench'),
localize = require("./localize"),
os = require('os'),
- prompt = require("prompt"),
+ promptLib = require("prompt"),
DEFAULT_BAR_NAME = "bb10app",
PROPERTY_FILE_NAME = 'blackberry10.json',
CORDOVA_DIR = '.cordova',
@@ -220,15 +222,15 @@ _self = {
exec : function (command, args, options, callback) {
//Optional params handling [args, options]
- if (typeof args === "Object" && !Array.isArray(args)) {
+ if (typeof args === "object" && !Array.isArray(args)) {
callback = options;
options = args;
args = [];
- } else if (typeof args === "function"){
+ } else if (typeof args === "function") {
callback = args;
options = {};
args = [];
- } else if (typeof options === "function"){
+ } else if (typeof options === "function") {
callback = options;
options = {};
}
@@ -251,7 +253,7 @@ _self = {
//put any args with spaces in quotes
args[i] = _self.inQuotes(args[i]);
}
- };
+ }
//delete _customOptions from options object before sending to exec
delete options._customOptions;
@@ -271,7 +273,7 @@ _self = {
},
findHomePath : function () {
- return process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];
+ return process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
},
getCordovaDir: function () {
@@ -314,15 +316,18 @@ _self = {
},
clone: function (original) {
- var clone = {};
+ var clone = {},
+ prop;
if (typeof original !== "object") {
clone = original;
} else if (Array.isArray(original)) {
- clone =original.slice();
+ clone = original.slice();
} else {
- for (var prop in original) {
+ /* jshint ignore:start */
+ for (prop in original) {
clone[prop] = original[prop];
}
+ /* jshint ignore:end */
}
return clone;
@@ -333,11 +338,11 @@ _self = {
"property": options
}
};
- prompt.start();
- prompt.colors = false;
- prompt.message = "";
- prompt.delimiter = "";
- prompt.get(promptSchema, function (err, results) {
+ promptLib.start();
+ promptLib.colors = false;
+ promptLib.message = "";
+ promptLib.delimiter = "";
+ promptLib.get(promptSchema, function (err, results) {
done(err, results.property);
});
},
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/bb10-ndk-version.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/bb10-ndk-version.js b/blackberry10/bin/templates/project/cordova/lib/bb10-ndk-version.js
index 63cbf03..760ae70 100755
--- a/blackberry10/bin/templates/project/cordova/lib/bb10-ndk-version.js
+++ b/blackberry10/bin/templates/project/cordova/lib/bb10-ndk-version.js
@@ -17,12 +17,13 @@
// specific language governing permissions and limitations
// under the License.
-var bbtools = process.env.CORDOVA_BBTOOLS;
-var reg = /host_\d+_\d+/g;
+var bbtools = process.env.CORDOVA_BBTOOLS,
+ reg = /host_\d+_\d+/g,
+ results;
-if(reg.test(bbtools)){
- var results = bbtools.match(reg);
- console.log(results[0].split('host_')[1].replace('_','.'));
-}else{
+if (reg.test(bbtools)) {
+ results = bbtools.match(reg);
+ console.log(results[0].split('host_')[1].replace('_', '.'));
+} else {
return new Error('Unable to find the blackberry ndk on your path.');
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/build.js b/blackberry10/bin/templates/project/cordova/lib/build.js
index 6112de6..4e7e8a3 100755
--- a/blackberry10/bin/templates/project/cordova/lib/build.js
+++ b/blackberry10/bin/templates/project/cordova/lib/build.js
@@ -68,14 +68,14 @@ try {
utils.series(
[
- function clean (done) {
+ function clean(done) {
var cmd = utils.isWindows() ? "clean" : "./clean",
args = [],
opts = { "cwd": path.normalize(__dirname + "/..") };
utils.exec(cmd, args, opts, done);
},
- function releaseBuild (allDone) {
+ function releaseBuild(allDone) {
var childTasks = [],
keystorepass = session.getKeyStorePass(command),
err;
@@ -93,13 +93,13 @@ try {
done();
});
} else {
- err = "No signing password provided. Please enter a value for 'keystorepass' in "+pkgrUtils.homedir()+"/.cordova/blackberry10.json or use --keystorepass via command-line";
+ err = "No signing password provided. Please enter a value for 'keystorepass' in " + pkgrUtils.homedir() + "/.cordova/blackberry10.json or use --keystorepass via command-line";
}
}
- async.waterfall(childTasks, function (error) { allDone(error || err);});
+ async.waterfall(childTasks, function (error) { allDone(error || err); });
},
- function build (done) {
+ function build(done) {
//enable webinspector in debug mode or if --webinspector was provided
if (!command.release || command.webInspector) {
bbwpArgv.push("-d");
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/clean.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/clean.js b/blackberry10/bin/templates/project/cordova/lib/clean.js
index 46391d3..c93cff1 100644
--- a/blackberry10/bin/templates/project/cordova/lib/clean.js
+++ b/blackberry10/bin/templates/project/cordova/lib/clean.js
@@ -20,5 +20,4 @@ var wrench = require('wrench'),
path = require("path"),
buildPath = path.normalize(__dirname + "/../../build/");
- wrench.rmdirSyncRecursive(buildPath, true);
-
+wrench.rmdirSyncRecursive(buildPath, true);
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/config-parser.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/config-parser.js b/blackberry10/bin/templates/project/cordova/lib/config-parser.js
index 6418ab0..ea3e4bf 100644
--- a/blackberry10/bin/templates/project/cordova/lib/config-parser.js
+++ b/blackberry10/bin/templates/project/cordova/lib/config-parser.js
@@ -153,7 +153,7 @@ function processWidgetData(data, widgetConfig, session) {
widgetConfig.autoHideSplashScreen = "true";
//set locally available features to access list
- if (data.feature) {
+ if (data.feature) {
featureArray = packagerUtils.isArray(data.feature) ? data.feature : [data.feature];
}
@@ -556,7 +556,7 @@ function processCordovaPreferences(data, widgetConfig) {
// <preference name="HideKeyboardFormAccessoryBar" value="enable/true or disable/false" />
if (preference.hidekeyboardformaccessorybar) {
- widgetConfig.enableFormControl = (hideFormControl !== 'enable' ) && (hideFormControl !== 'true');
+ widgetConfig.enableFormControl = (hideFormControl !== 'enable') && (hideFormControl !== 'true');
}
// <preference name="popupBlocker" value="enable or disable" />
@@ -592,7 +592,7 @@ function processCordovaPreferences(data, widgetConfig) {
function processBgColor(bgColor) {
//convert bgColor to a number
- bgColorNum = parseInt(bgColor, 16);
+ var bgColorNum = parseInt(bgColor, 16);
if (isNaN(bgColorNum)) {
//bgColor is not a number, throw error
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
index 12ad61f..49abda9 100755
--- a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
@@ -100,9 +100,9 @@ function generateDeployTokenOptions(targetIp, targetPassword) {
}
function execNativeScript(script, options, callback) {
- var script = path.join(process.env.CORDOVA_BBTOOLS, script);
+ var fullPath = path.join(process.env.CORDOVA_BBTOOLS, script);
- utils.exec(script, options, {
+ utils.exec(fullPath, options, {
"cwd" : workingDir,
"env" : process.env
}, callback);
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/file-manager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/file-manager.js b/blackberry10/bin/templates/project/cordova/lib/file-manager.js
index 596102f..977ca2b 100755
--- a/blackberry10/bin/templates/project/cordova/lib/file-manager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/file-manager.js
@@ -42,16 +42,18 @@ function unzip(from, to) {
}
for (p in entries) {
- if (p.indexOf("__MACOSX") >= 0) {
- continue;
- }
+ if (entries.hasOwnProperty(p)) {
+ if (p.indexOf("__MACOSX") >= 0) {
+ continue;
+ }
- if (p.split("/").length > 1) {
- parent = p.split("/").slice(0, -1).join("/");
- wrench.mkdirSyncRecursive(to + "/" + parent, "0755");
- }
+ if (p.split("/").length > 1) {
+ parent = p.split("/").slice(0, -1).join("/");
+ wrench.mkdirSyncRecursive(to + "/" + parent, "0755");
+ }
- fs.writeFileSync(to + "/" + p, entries[p]);
+ fs.writeFileSync(to + "/" + p, entries[p]);
+ }
}
} else {
throw localize.translate("EXCEPTION_WIDGET_ARCHIVE_NOT_FOUND", from);
@@ -137,7 +139,7 @@ function generateFrameworkModulesJS(session) {
modulesStr += "define('" + module.name + "', function (require, exports, module) {\n" +
fs.readFileSync(module.file, "utf-8") + "\n" +
"});\n";
- frameworkModulesStr += "'" + module.name + "'" + (index !== modulesList.length-1 ? ", " : "");
+ frameworkModulesStr += "'" + module.name + "'" + (index !== modulesList.length - 1 ? ", " : "");
// Issue with 10.1 webplatform - requires certain files in chrome/lib
if (MODULES_TO_KEEP.indexOf(module.name) < 0) {
fs.unlinkSync(path.normalize(dest.CHROME + "/" + module.name));
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/native-packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/native-packager.js b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
index f9d696f..511139f 100644
--- a/blackberry10/bin/templates/project/cordova/lib/native-packager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
@@ -204,7 +204,7 @@ function generateTabletXMLFile(session, config) {
}
pkgrUtils.writeFile(session.sourceDir, conf.BAR_DESCRIPTOR, xmlData);
- }
+}
function generateOptionsFile(session, target, config) {
var srcFiles = wrench.readdirSyncRecursive(session.sourceDir),
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/packager-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/packager-utils.js b/blackberry10/bin/templates/project/cordova/lib/packager-utils.js
index 121c6a7..d2341ee 100644
--- a/blackberry10/bin/templates/project/cordova/lib/packager-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/packager-utils.js
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+/* globals Buffer */
+
var fs = require('fs'),
path = require('path'),
wrench = require('wrench'),
@@ -185,7 +187,7 @@ _self = {
if (require('os').type().toLowerCase().indexOf("windows") >= 0) {
return "\"" + str + "\"";
} else {
- return str.replace(/(["\s'$`\\])/g,'\\$1');
+ return str.replace(/(["\s'$`\\])/g, '\\$1');
}
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/packager-validator.js b/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
index f023e8e..985e137 100644
--- a/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
+++ b/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
@@ -91,6 +91,7 @@ _self = {
//Validation for configObj, iterates through whitelisted features in configObj to remove any non-existing APIs
validateConfig: function (session, configObj) {
+ var cordovaJsFiles;
//if packageCordovaJs was set, test for existing cordova.js files
if (configObj.packageCordovaJs) {
cordovaJsFiles = packagerUtils.listFiles(session.sourceDir, function (file) {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/packager.js b/blackberry10/bin/templates/project/cordova/lib/packager.js
index ccbbeff..e8ac24c 100644
--- a/blackberry10/bin/templates/project/cordova/lib/packager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/packager.js
@@ -27,7 +27,7 @@ var path = require("path"),
session;
module.exports = {
- start: function(callback) {
+ start: function (callback) {
try {
cmdline.parse(process.argv);
session = require("./session").initialize(cmdline.commander);
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/run-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/run-utils.js b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
index 9229486..90c4a55 100644
--- a/blackberry10/bin/templates/project/cordova/lib/run-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
@@ -26,7 +26,8 @@ var fs = require("fs"),
async = require("async"),
session = require("./session"),
properties = utils.getProperties(),
- workingdir = path.normalize(__dirname + "/..");
+ workingdir = path.normalize(__dirname + "/.."),
+ _self;
//Options looking for are: (Device | Emulator, query, devicepass). Calls back with: (error || options object, target object)
function getTargetName(options, done) {
@@ -44,7 +45,7 @@ function getTargetName(options, done) {
{
ip: function (done) {
ipFinder(function (ip) {
- done(ip ? null : "No connected BlackBerry 10 " + targetType + " found", ip);
+ done(ip ? null : "No connected BlackBerry 10 " + targetType + " found", ip);
});
},
devicePass: function (done) {
@@ -98,7 +99,7 @@ function validateTarget(options, targetName, allDone) {
});
});
} else {
- err = "IP is not defined in target \"" + target + "\"";
+ err = "IP is not defined in target \"" + deployTarget.name + "\"";
}
}
@@ -258,15 +259,15 @@ _self = {
}
runTasks = [
utils.exec.bind(this, script, args, { "cwd": projectRootDir, _customOptions: {silent: true}}),
- function listInstalledAppsOutput (stdout, stderr, done) {
+ function listInstalledAppsOutput(stdout, stderr, done) {
installedAppsOutput = stdout;
fs.readFile(path.join(__dirname + "/../../www/", "config.xml"), done);
},
- function configXMLOutput (result, done) {
+ function configXMLOutput(result, done) {
var parser = new xml2js.Parser();
parser.parseString(result, done);
},
- function parsedConfigXMLOutput (result, done) {
+ function parsedConfigXMLOutput(result, done) {
if (installedAppsOutput.indexOf(result['@'].id) !== -1) {
var deployOptions = generateDeployOptions(options, deployTarget, true);
execNativeDeploy(deployOptions, done);
@@ -287,13 +288,13 @@ _self = {
//Function returns (error || deployTarget)
checkBuild : function (deployTarget, allDone) {
- barPath = path.normalize(__dirname + "/../../build/" +
+ var barPath = path.normalize(__dirname + "/../../build/" +
(deployTarget.type === "device" ? "device" : "simulator") +
"/" + utils.genBarName() + ".bar");
if (fs.existsSync(barPath)) {
allDone(null, deployTarget);
} else {
- allDone(err = "No build file exists, please run: build [--debug] [--release] [-k | --keystorepass] [-b | --buildId <number>] [-p | --params <json>] [-ll | --loglevel <level>] ");
+ allDone("No build file exists, please run: build [--debug] [--release] [-k | --keystorepass] [-b | --buildId <number>] [-p | --params <json>] [-ll | --loglevel <level>] ");
}
},
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/run.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/run.js b/blackberry10/bin/templates/project/cordova/lib/run.js
index b3966ec..2796437 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run.js
+++ b/blackberry10/bin/templates/project/cordova/lib/run.js
@@ -21,7 +21,7 @@ var path = require("path"),
utils = require("./utils"),
options = require('commander'),
runUtils = require("./run-utils"),
- signingUtils = require("./signing-utils");
+ signingUtils = require("./signing-utils"),
async = require("async");
function install(deployTarget, done) {
@@ -51,7 +51,7 @@ options
.option('--no-uninstall', 'does not uninstall application from device')
.option('--no-launch', 'do not launch the application on device')
.option('--no-build', 'deploy the pre-built bar file and skip building')
- .on('--help', function() {
+ .on('--help', function () {
console.log(' Examples:');
console.log('');
console.log(" Deploying to a predefined target");
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/session.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/session.js b/blackberry10/bin/templates/project/cordova/lib/session.js
index 5f1b6fe..dd6cc39 100644
--- a/blackberry10/bin/templates/project/cordova/lib/session.js
+++ b/blackberry10/bin/templates/project/cordova/lib/session.js
@@ -26,11 +26,12 @@ var path = require("path"),
function getParams(cmdline, toolName) {
var properties = utils.getProperties(),
- params = properties[toolName];
+ params = properties[toolName],
+ paramsPath;
if (cmdline.params) {
if (!cmdParams) {
- var paramsPath = path.resolve(cmdline.params);
+ paramsPath = path.resolve(cmdline.params);
if (fs.existsSync(paramsPath)) {
try {
@@ -73,7 +74,7 @@ module.exports = {
} else if (properties.keystorepass) {
keystorepass = properties.keystorepass;
} else if (params["-storepass"]) {
- keystorepass = params["-storepass"];
+ keystorepass = params["-storepass"];
}
return keystorepass;
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/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 e7c8a83..4c070bb 100644
--- a/blackberry10/bin/templates/project/cordova/lib/target-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/target-utils.js
@@ -114,6 +114,7 @@ _self = {
result = [defaultIp];
}
for (i = 0; i < result.length; i++) {
+ /* jshint ignore:start */
_self.checkConnection(result[i], 'device', function (connection, ip) {
if (connection) {
callback(ip);
@@ -122,6 +123,7 @@ _self = {
callback();
}
});
+ /* jshint ignore:end */
}
});
},
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/templates/project/cordova/lib/version.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/version.js b/blackberry10/bin/templates/project/cordova/lib/version.js
index 694451f..3068597 100755
--- a/blackberry10/bin/templates/project/cordova/lib/version.js
+++ b/blackberry10/bin/templates/project/cordova/lib/version.js
@@ -20,7 +20,7 @@ var fs = require("fs"),
readline = require("readline"),
util = require("util"),
path = require('path'),
- projectPath = path.resolve(__dirname,'../..'),
+ projectPath = path.resolve(__dirname, '../..'),
filename = path.join(projectPath, 'www/cordova.js');
if (fs.existsSync(filename)) {
@@ -29,12 +29,14 @@ if (fs.existsSync(filename)) {
terminal: false
});
- rl.on("line", function(line){
+ rl.on("line", function (line) {
+ var splitSpace,
+ splitDash;
if (/^\/\/\s\d/.test(line)) {
rl.close();
- var splitSpace = line.split(" ");
+ splitSpace = line.split(" ");
if (splitSpace.length > 1) {
- var splitDash = splitSpace[1].split("-");
+ splitDash = splitSpace[1].split("-");
if (splitDash.length > 0) {
console.log(splitDash[0]);
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/test/cordova/integration/target.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/test/cordova/integration/target.js b/blackberry10/bin/test/cordova/integration/target.js
index 71b8028..7030a97 100644
--- a/blackberry10/bin/test/cordova/integration/target.js
+++ b/blackberry10/bin/test/cordova/integration/target.js
@@ -50,7 +50,7 @@ describe("cordova/target tests", function () {
utils.copyFile(configPath, path.join(utils.getCordovaDir(), "bb10bak"));
fs.unlinkSync(configPath);
if (!testAppCreated) {
- executeScript(CREATE_COMMAND , [appFolder]);
+ executeScript(CREATE_COMMAND, [appFolder]);
testAppCreated = true;
}
});
@@ -79,7 +79,7 @@ describe("cordova/target tests", function () {
var project;
executeScript(TARGET_COMMAND, ["add", "z10", "169.254.0.1", "-t", "device", "-p", "pass", "--pin", "DEADBEEF"]);
- executeScript(TARGET_COMMAND , ["remove", "z10"]);
+ executeScript(TARGET_COMMAND, ["remove", "z10"]);
project = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
expect(Object.keys(project.targets).length).toEqual(0);
});
@@ -119,7 +119,7 @@ describe("cordova/target tests", function () {
it("should warn invalid pin", function () {
//keep this in last test to remove test app
- this.after(function() {
+ this.after(function () {
wrench.rmdirSyncRecursive(tempFolder);
});
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/test/cordova/unit/spec/lib/signing-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/test/cordova/unit/spec/lib/signing-utils.js b/blackberry10/bin/test/cordova/unit/spec/lib/signing-utils.js
index b2f90c6..1ba5c01 100644
--- a/blackberry10/bin/test/cordova/unit/spec/lib/signing-utils.js
+++ b/blackberry10/bin/test/cordova/unit/spec/lib/signing-utils.js
@@ -171,7 +171,7 @@ describe("signing-utils", function () {
expect(result).toContain("D:");
});
- it("can find bbidtoken.csk on a drive other than C", function() {
+ it("can find bbidtoken.csk on a drive other than C", function () {
process.env.USERPROFILE = "D:\\Users\\user";
spyOn(fs, "existsSync").andCallFake(function (path) {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/bin/test/cordova/unit/spec/lib/test-utilities.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/test/cordova/unit/spec/lib/test-utilities.js b/blackberry10/bin/test/cordova/unit/spec/lib/test-utilities.js
index fd3cdd7..8b53c8e 100644
--- a/blackberry10/bin/test/cordova/unit/spec/lib/test-utilities.js
+++ b/blackberry10/bin/test/cordova/unit/spec/lib/test-utilities.js
@@ -57,7 +57,7 @@ module.exports = {
cloneObj: function (obj) {
var newObj = (obj instanceof Array) ? [] : {}, i;
-
+ /* jshint ignore:start */
for (i in obj) {
if (i === 'clone') continue;
@@ -67,6 +67,7 @@ module.exports = {
newObj[i] = obj[i];
}
}
+ /* jshint ignore:end */
return newObj;
},
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/363f611c/blackberry10/framework/lib/PluginResult.js
----------------------------------------------------------------------
diff --git a/blackberry10/framework/lib/PluginResult.js b/blackberry10/framework/lib/PluginResult.js
index 68acf23..77e2c49 100644
--- a/blackberry10/framework/lib/PluginResult.js
+++ b/blackberry10/framework/lib/PluginResult.js
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-function PluginResult (args, env) {
+function PluginResult(args, env) {
var CALLBACK_STATUS_NO_RESULT = 0,
CALLBACK_STATUS_OK = 1,