You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/09/21 02:56:01 UTC
[2/4] android commit: fixing jshint issues
fixing jshint issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/511fe7c5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/511fe7c5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/511fe7c5
Branch: refs/heads/master
Commit: 511fe7c51e4ab0110f9cce523822ec3233c0ae6e
Parents: acb3cc8
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 14 18:22:53 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Sep 20 19:54:34 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/Api.js | 3 +--
bin/templates/cordova/lib/AndroidStudio.js | 3 +++
bin/templates/cordova/lib/pluginHandlers.js | 8 ++++----
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/511fe7c5/bin/templates/cordova/Api.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/Api.js b/bin/templates/cordova/Api.js
index 7a16043..8885809 100644
--- a/bin/templates/cordova/Api.js
+++ b/bin/templates/cordova/Api.js
@@ -18,7 +18,6 @@
*/
var path = require('path');
-var fs = require('fs');
var AndroidProject = require('./lib/AndroidProject');
var AndroidStudio = require('./lib/AndroidStudio');
@@ -222,7 +221,7 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles();
}.bind(this))
// CB-11022 Return truthy value to prevent running prepare after
- .thenResolve(true)
+ .thenResolve(true);
};
/**
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/511fe7c5/bin/templates/cordova/lib/AndroidStudio.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/AndroidStudio.js b/bin/templates/cordova/lib/AndroidStudio.js
index b26127b..d0214af 100644
--- a/bin/templates/cordova/lib/AndroidStudio.js
+++ b/bin/templates/cordova/lib/AndroidStudio.js
@@ -4,12 +4,15 @@
* @param {String} root Root folder of the project
*/
+/*jshint esversion: 6 */
+
var path = require('path');
var fs = require('fs');
function isAndroidStudioProject(root) {
var eclipseFiles = ['AndroidManifest.xml', 'libs', 'res', 'project.properties', 'platform_www'];
var androidStudioFiles = ['app', 'gradle', 'build', 'app/src/main/assets'];
+ var file;
for(file of eclipseFiles) {
if(fs.existsSync(path.join(root, file))) {
return false;
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/511fe7c5/bin/templates/cordova/lib/pluginHandlers.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/pluginHandlers.js b/bin/templates/cordova/lib/pluginHandlers.js
index 79a443a..d209de1 100644
--- a/bin/templates/cordova/lib/pluginHandlers.js
+++ b/bin/templates/cordova/lib/pluginHandlers.js
@@ -34,7 +34,7 @@ var handlers = {
var dest = path.join(obj.targetDir, path.basename(obj.src));
if(options && options.android_studio === true) {
- dest = path.join("app/src/main/java", obj.targetDir.substring(4), path.basename(obj.src));
+ dest = path.join('app/src/main/java', obj.targetDir.substring(4), path.basename(obj.src));
}
if (options && options.force) {
@@ -47,7 +47,7 @@ var handlers = {
var dest = path.join(obj.targetDir, path.basename(obj.src));
if(options && options.android_studio === true) {
- dest = path.join("app/src/main/java", obj.targetDir.substring(4), path.basename(obj.src));
+ dest = path.join('app/src/main/java', obj.targetDir.substring(4), path.basename(obj.src));
}
deleteJava(project.projectDir, dest);
@@ -57,14 +57,14 @@ var handlers = {
install:function(obj, plugin, project, options) {
var dest = path.join('libs', path.basename(obj.src));
if(options && options.android_studio === true) {
- dest = path.join("app/libs", path.basename(obj.src));
+ dest = path.join('app/libs', path.basename(obj.src));
}
copyFile(plugin.dir, obj.src, project.projectDir, dest, !!(options && options.link));
},
uninstall:function(obj, plugin, project, options) {
var dest = path.join('libs', path.basename(obj.src));
if(options && options.android_studio === true) {
- dest = path.join("app/libs", path.basename(obj.src));
+ dest = path.join('app/libs', path.basename(obj.src));
}
removeFile(project.projectDir, dest);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org