public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

fixing jshint issues

Browse Source
This commit is contained in:
Anis Kadri 2016-09-14 18:22:53 -07:00 committed by Joe Bowser
parent acb3cc80b7
commit 511fe7c51e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/templates/cordova/Api.js vendored
View File

@ -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);
};
/**

3
bin/templates/cordova/lib/AndroidStudio.js vendored
View File

@ -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;

8
bin/templates/cordova/lib/pluginHandlers.js vendored
View File

@ -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);
}