You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ka...@apache.org on 2014/04/24 23:09:07 UTC
git commit: Remove trailing spaces in all js files
Repository: cordova-plugman
Updated Branches:
refs/heads/master b0d0782d4 -> 8aca4cb5b
Remove trailing spaces in all js files
So that everyone can use auto removal of trailing spaces without generating
unwanted diff lines. Only white space changes, nothing else.
The command used:
sed -i '' 's/[[:space:]]*$//g' **/*.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/8aca4cb5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/8aca4cb5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/8aca4cb5
Branch: refs/heads/master
Commit: 8aca4cb5b1a8012aa23ba05386d10cb59b3b4817
Parents: b0d0782
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Thu Apr 24 17:06:26 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Thu Apr 24 17:06:26 2014 -0400
----------------------------------------------------------------------
spec/common.js | 2 +-
spec/install.spec.js | 18 ++++++++--------
spec/platforms/amazon-fireos.spec.js | 8 ++++----
spec/platforms/ios.spec.js | 6 +++---
spec/platforms/windows8.spec.js | 2 +-
spec/platforms/wp7.spec.js | 2 +-
spec/platforms/wp8.spec.js | 2 +-
spec/uninstall.spec.js | 34 +++++++++++++++----------------
spec/util/csproj.spec.js | 4 ++--
src/install.js | 14 ++++++-------
src/platforms/common.js | 2 +-
src/platforms/firefoxos.js | 2 +-
src/platforms/ios.js | 2 +-
src/platforms/windows8.js | 6 +++---
src/platforms/wp8.js | 2 +-
src/uninstall.js | 34 +++++++++++++++----------------
src/util/config-changes.js | 6 +++---
src/util/csproj.js | 8 ++++----
src/util/default-engines.js | 32 ++++++++++++++---------------
src/util/dependencies.js | 2 +-
src/util/plist-helpers.js | 10 ++++-----
src/util/w8jsproj.js | 14 ++++++-------
src/util/xml-helpers.js | 6 +++---
23 files changed, 109 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/common.js
----------------------------------------------------------------------
diff --git a/spec/common.js b/spec/common.js
index 6a87e23..b71efbf 100644
--- a/spec/common.js
+++ b/spec/common.js
@@ -30,7 +30,7 @@ if(opt.debug) {
}
module.exports = common = {
- spy: {
+ spy: {
getInstall: function(emitSpy){
return common.spy.startsWith(emitSpy, 'Install start');
},
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/install.spec.js
----------------------------------------------------------------------
diff --git a/spec/install.spec.js b/spec/install.spec.js
index c15d38f..732eb24 100644
--- a/spec/install.spec.js
+++ b/spec/install.spec.js
@@ -33,7 +33,7 @@ var install = require('../src/install'),
'G' : path.join(plugins_dir, 'dependencies', 'G')
},
promise,
- results = {},
+ results = {},
dummy_id = 'com.phonegap.plugins.dummyplugin';
function installPromise(f) {
@@ -83,7 +83,7 @@ describe('start', function() {
.then(
function(){ return install('android', project, plugins['DummyPlugin']) }
).then(
- function(){
+ function(){
results['actions_callCount'] = actions_push.callCount;
results['actions_create'] = ca.argsForCall[0];
results['config_add'] = config_queue_add.argsForCall[0];
@@ -95,14 +95,14 @@ describe('start', function() {
).then(
function(){
emit = spyOn(events, 'emit');
- return install('android', project, plugins['ChildBrowser'])
+ return install('android', project, plugins['ChildBrowser'])
}
).then(
- function(){
- return install('android', project, plugins['VariablePlugin'], plugins_install_dir, { cli_variables:{API_KEY:'batman'} })
+ function(){
+ return install('android', project, plugins['VariablePlugin'], plugins_install_dir, { cli_variables:{API_KEY:'batman'} })
}
).then(
- function(){
+ function(){
done = true;
results['prepareCount'] = prepare.callCount;
results['emit_results'] = [];
@@ -124,7 +124,7 @@ describe('install', function() {
beforeEach(function() {
prepare = spyOn(plugman, 'prepare').andReturn( Q(true) );
-
+
exec = spyOn(child_process, 'exec').andCallFake(function(cmd, cb) {
cb(false, '', '');
});
@@ -353,7 +353,7 @@ describe('install', function() {
waitsFor(function () { return done; }, 'install promise never resolved', 200);
runs(function () {
var install = common.spy.getInstall(emit);
-
+
expect(done.message).toEqual('Cyclic dependency from G to H');
});
});
@@ -455,7 +455,7 @@ describe('install', function() {
describe('end', function() {
-
+
it('end', function() {
done = false;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/amazon-fireos.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/amazon-fireos.spec.js b/spec/platforms/amazon-fireos.spec.js
index e634731..49a8b0d 100644
--- a/spec/platforms/amazon-fireos.spec.js
+++ b/spec/platforms/amazon-fireos.spec.js
@@ -19,7 +19,7 @@ var amazon_fireos = require('../../src/platforms/amazon-fireos'),
var xml_path = path.join(dummyplugin, 'plugin.xml')
, xml_text = fs.readFileSync(xml_path, 'utf-8')
, plugin_et = new et.ElementTree(et.XML(xml_text));
-
+
var platformTag = plugin_et.find('./platform[@name="amazon-fireos"]');
var dummy_id = plugin_et._root.attrib['id'];
@@ -82,13 +82,13 @@ describe('amazon-fireos project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
+ amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/amazon-fireos/DummyPlugin.java', temp, path.join('src', 'com', 'phonegap', 'plugins', 'dummyplugin', 'DummyPlugin.java'));
});
it('should throw if source file cannot be found', function() {
var source = copyArray(invalid_source);
expect(function() {
- amazon_fireos['source-file'].install(source[0], faultyplugin, temp);
+ amazon_fireos['source-file'].install(source[0], faultyplugin, temp);
}).toThrow('"' + path.resolve(faultyplugin, 'src/amazon-fireos/NotHere.java') + '" not found!');
});
it('should throw if target file already exists', function() {
@@ -100,7 +100,7 @@ describe('amazon-fireos project handler', function() {
var source = copyArray(valid_source);
expect(function() {
- amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
+ amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
}).toThrow('"' + target + '" already exists!');
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/ios.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/ios.spec.js b/spec/platforms/ios.spec.js
index a4e7c22..e2589e0 100644
--- a/spec/platforms/ios.spec.js
+++ b/spec/platforms/ios.spec.js
@@ -304,9 +304,9 @@ describe('ios project handler', function() {
});
it('should rm the file from the right target location when element has a target-dir', function(){
var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] != undefined});
- shell.cp('-rf', ios_config_xml_project, temp);
+ shell.cp('-rf', ios_config_xml_project, temp);
var spy = spyOn(shell, 'rm');
-
+
ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
expect(spy).toHaveBeenCalledWith('-rf', path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'targetDir', 'TargetDirTest.m'));
});
@@ -314,7 +314,7 @@ describe('ios project handler', function() {
var source = copyArray(valid_source).filter(function(s) { return s.attrib['framework'] == "true"});
shell.cp('-rf', ios_config_xml_project, temp);
var spy = spyOn(proj_files.xcode, 'removeFramework');
-
+
ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
expect(spy).toHaveBeenCalledWith(path.join('SampleApp', 'Plugins', dummy_id, 'SourceWithFramework.m'));
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/windows8.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/windows8.spec.js b/spec/platforms/windows8.spec.js
index 6764301..99a5cb7 100644
--- a/spec/platforms/windows8.spec.js
+++ b/spec/platforms/windows8.spec.js
@@ -89,7 +89,7 @@ describe('windows8 project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+ windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/windows8/dummer.js', temp, path.join('www', 'plugins', 'com.phonegap.plugins.dummyplugin', 'dummer.js'));
});
it('should throw if source-file src cannot be found', function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/wp7.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/wp7.spec.js b/spec/platforms/wp7.spec.js
index c085be4..262e851 100644
--- a/spec/platforms/wp7.spec.js
+++ b/spec/platforms/wp7.spec.js
@@ -83,7 +83,7 @@ describe('wp7 project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- wp7['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+ wp7['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/wp7/DummyPlugin.cs', temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
});
it('should throw if source-file src cannot be found', function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/wp8.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/wp8.spec.js b/spec/platforms/wp8.spec.js
index 2b0f265..ba9cdb4 100644
--- a/spec/platforms/wp8.spec.js
+++ b/spec/platforms/wp8.spec.js
@@ -88,7 +88,7 @@ describe('wp8 project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+ wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/wp8/DummyPlugin.cs', temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
});
it('should throw if source-file src cannot be found', function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/uninstall.spec.js
----------------------------------------------------------------------
diff --git a/spec/uninstall.spec.js b/spec/uninstall.spec.js
index 875b609..a0c903c 100644
--- a/spec/uninstall.spec.js
+++ b/spec/uninstall.spec.js
@@ -2,7 +2,7 @@ var uninstall = require('../src/uninstall'),
install = require('../src/install'),
actions = require('../src/util/action-stack'),
config_changes = require('../src/util/config-changes'),
- events = require('../src/events'),
+ events = require('../src/events'),
plugman = require('../plugman'),
common = require('./common'),
fs = require('fs'),
@@ -154,7 +154,7 @@ describe('uninstallPlugin', function() {
});
describe('with dependencies', function() {
- it('should delete all dependent plugins', function() {
+ it('should delete all dependent plugins', function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('A', plugins_install_dir) );
});
@@ -170,7 +170,7 @@ describe('uninstallPlugin', function() {
});
});
- it("should fail if plugin is a required dependency", function() {
+ it("should fail if plugin is a required dependency", function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('C', plugins_install_dir) );
});
@@ -180,7 +180,7 @@ describe('uninstallPlugin', function() {
});
});
- it("allow forcefully removing a plugin", function() {
+ it("allow forcefully removing a plugin", function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('C', plugins_install_dir, {force: true}) );
});
@@ -192,7 +192,7 @@ describe('uninstallPlugin', function() {
});
});
- it("never remove top level plugins if they are a dependency", function() {
+ it("never remove top level plugins if they are a dependency", function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('A', plugins_install_dir2) );
});
@@ -253,27 +253,27 @@ describe('uninstall', function() {
});
describe('end', function() {
-
+
it('end', function() {
done = false;
- promise.then(
- function(){
- return uninstall('android', project, plugins['DummyPlugin'])
+ promise.then(
+ function(){
+ return uninstall('android', project, plugins['DummyPlugin'])
}
- ).then(
- function(){
- // Fails... A depends on
- return uninstall('android', project, plugins['C'])
+ ).then(
+ function(){
+ // Fails... A depends on
+ return uninstall('android', project, plugins['C'])
}
- ).fail(
+ ).fail(
function(err) {
expect(err.message).toBe("The plugin 'C' is required by (A), skipping uninstallation.");
}
- ).then(
- function(){
+ ).then(
+ function(){
// dependencies on C,D ... should this only work with --recursive? prompt user..?
- return uninstall('android', project, plugins['A'])
+ return uninstall('android', project, plugins['A'])
}
).fin(function(err){
if(err)
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/util/csproj.spec.js
----------------------------------------------------------------------
diff --git a/spec/util/csproj.spec.js b/spec/util/csproj.spec.js
index a24ab72..c506c38 100644
--- a/spec/util/csproj.spec.js
+++ b/spec/util/csproj.spec.js
@@ -27,7 +27,7 @@ describe('csproj', function() {
});
describe('write method', function() {
-
+
});
describe('source file', function() {
@@ -43,7 +43,7 @@ describe('csproj', function() {
var test_csproj = new csproj(example1_csproj);
it('should properly add .xaml files', function() {
test_csproj.addSourceFile(page_test);
- expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]')).toBeTruthy();
+ expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]')).toBeTruthy();
expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]/Generator').text).toEqual('MSBuild:Compile');
expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]/SubType').text).toEqual('Designer');
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index 277ef83..cce145d 100644
--- a/src/install.js
+++ b/src/install.js
@@ -71,7 +71,7 @@ function possiblyFetch(id, plugins_dir, options) {
}
var opts = underscore.extend({}, options, {
- link: false,
+ link: false,
client: 'plugman'
});
@@ -278,7 +278,7 @@ var runInstall = module.exports.runInstall = function runInstall(actions, platfo
filtered_variables[key] = options.cli_variables[key]
});
install.filtered_variables = filtered_variables;
-
+
if (missing_vars.length > 0) {
throw new Error('Variable(s) missing: ' + missing_vars.join(", "));
}
@@ -327,7 +327,7 @@ function installDependencies(install, dependencies, options) {
return dependencies.reduce(function(soFar, depXml) {
return soFar.then(
- function() {
+ function() {
var dep = {
id: depXml.attrib.id,
subdir: depXml.attrib.subdir || '',
@@ -348,7 +348,7 @@ function installDependencies(install, dependencies, options) {
options.graph.getChain(install.top_plugin_id);
return tryFetchDependency(dep, install, options)
- .then(
+ .then(
function(url){
dep.url = url;
return installDependency(dep, install, options);
@@ -439,7 +439,7 @@ function tryFetchDependency(dep, install, options) {
}
}
- // Test relative to parent folder
+ // Test relative to parent folder
if( dep.url && isRelativePath(dep.url) ) {
var relativePath = path.resolve(install.top_plugin_dir, '../' + dep.url);
@@ -463,7 +463,7 @@ function installDependency(dep, install, options) {
if ( fs.existsSync(dep.install_dir) ) {
events.emit('verbose', 'Dependent plugin "' + dep.id + '" already fetched, using that version.');
var opts = underscore.extend({}, options, {
- cli_variables: install.filtered_variables,
+ cli_variables: install.filtered_variables,
is_top_level: false
});
@@ -473,7 +473,7 @@ function installDependency(dep, install, options) {
events.emit('verbose', 'Dependent plugin "' + dep.id + '" not fetched, retrieving then installing.');
var opts = underscore.extend({}, options, {
- cli_variables: install.filtered_variables,
+ cli_variables: install.filtered_variables,
is_top_level: false,
subdir: dep.subdir,
git_ref: dep.git_ref,
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/common.js
----------------------------------------------------------------------
diff --git a/src/platforms/common.js b/src/platforms/common.js
index 9f01bdd..399da00 100644
--- a/src/platforms/common.js
+++ b/src/platforms/common.js
@@ -31,7 +31,7 @@ module.exports = common = {
// Same as copy file but throws error if target exists
copyNewFile:function(plugin_dir, src, project_dir, dest) {
var target_path = common.resolveTargetPath(project_dir, dest);
- if (fs.existsSync(target_path))
+ if (fs.existsSync(target_path))
throw new Error('"' + target_path + '" already exists!');
common.copyFile(plugin_dir, src, project_dir, dest);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/firefoxos.js
----------------------------------------------------------------------
diff --git a/src/platforms/firefoxos.js b/src/platforms/firefoxos.js
index c2e5971..efbeba9 100644
--- a/src/platforms/firefoxos.js
+++ b/src/platforms/firefoxos.js
@@ -68,5 +68,5 @@ module.exports = {
uninstall:function(source_el, project_dir, plugin_id) {
events.emit('verbose', 'lib-file.uninstall is not supported for firefoxos');
}
- }
+ }
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/ios.js
----------------------------------------------------------------------
diff --git a/src/platforms/ios.js b/src/platforms/ios.js
index 9631e64..4f570c3 100644
--- a/src/platforms/ios.js
+++ b/src/platforms/ios.js
@@ -147,7 +147,7 @@ module.exports = {
uninstall:function(source_el, project_dir, plugin_id) {
events.emit('verbose', 'lib-file.uninstall is not supported for ios');
}
- },
+ },
parseProjectFile:function(project_dir) {
// TODO: With ConfigKeeper introduced in config-changes.js
// there is now double caching of iOS project files.
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/windows8.js
----------------------------------------------------------------------
diff --git a/src/platforms/windows8.js b/src/platforms/windows8.js
index 1f7583f..523dc6e 100644
--- a/src/platforms/windows8.js
+++ b/src/platforms/windows8.js
@@ -78,7 +78,7 @@ module.exports = {
}
},
"lib-file": {
- install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+ install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
var inc = el.attrib['Include'];
project_file.addSDKRef(inc);
},
@@ -114,7 +114,7 @@ module.exports = {
var src = el.attrib['src'];
// technically it is not possible to get here without isCustom == true -jm
- // var isCustom = el.attrib.custom == "true";
+ // var isCustom = el.attrib.custom == "true";
var type = el.attrib["type"];
// unfortunately we have to generate the plugin_dir path because it is not passed to uninstall
var plugin_dir = path.join(project_dir,"cordova/plugins",plugin_id,src);
@@ -123,7 +123,7 @@ module.exports = {
project_file.removeProjectReference(plugin_dir);
}
else {
- // if(isCustom) { }
+ // if(isCustom) { }
var targetPath = path.join('plugins', plugin_id);
common.removeFile(project_dir, targetPath);
project_file.removeReference(src);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/wp8.js
----------------------------------------------------------------------
diff --git a/src/platforms/wp8.js b/src/platforms/wp8.js
index 31bbdea..1163b44 100644
--- a/src/platforms/wp8.js
+++ b/src/platforms/wp8.js
@@ -109,5 +109,5 @@ module.exports = {
uninstall:function(source_el, project_dir, plugin_id) {
events.emit('verbose', 'lib-file.uninstall is not supported for wp8');
}
- }
+ }
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/uninstall.js
----------------------------------------------------------------------
diff --git a/src/uninstall.js b/src/uninstall.js
index 1997abd..04ecb1a 100644
--- a/src/uninstall.js
+++ b/src/uninstall.js
@@ -197,7 +197,7 @@ function runUninstallPlatform(actions, platform, project_dir, plugin_dir, plugin
danglers.map(function(dangler) {
var dependent_path = dependencies.resolvePath(dangler, plugins_dir);
- var opts = underscore.extend({}, options, {
+ var opts = underscore.extend({}, options, {
is_top_level: depsInfo.top_level_plugins.indexOf(dangler) > -1,
depsInfo: depsInfo
});
@@ -221,7 +221,7 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
var platformTag = plugin_et.find('./platform[@name="'+platform+'"]');
www_dir = www_dir || handler.www_dir(project_dir);
events.emit('log', 'Uninstalling ' + plugin_id + ' from ' + platform);
-
+
var assets = plugin_et.findall('./asset');
if (platformTag) {
var sourceFiles = platformTag.findall('./source-file'),
@@ -233,38 +233,38 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
// queue up native stuff
sourceFiles && sourceFiles.forEach(function(source) {
- actions.push(actions.createAction(handler["source-file"].uninstall,
- [source, project_dir, plugin_id],
- handler["source-file"].install,
+ actions.push(actions.createAction(handler["source-file"].uninstall,
+ [source, project_dir, plugin_id],
+ handler["source-file"].install,
[source, plugin_dir, project_dir, plugin_id]));
});
headerFiles && headerFiles.forEach(function(header) {
- actions.push(actions.createAction(handler["header-file"].uninstall,
- [header, project_dir, plugin_id],
- handler["header-file"].install,
+ actions.push(actions.createAction(handler["header-file"].uninstall,
+ [header, project_dir, plugin_id],
+ handler["header-file"].install,
[header, plugin_dir, project_dir, plugin_id]));
});
resourceFiles && resourceFiles.forEach(function(resource) {
- actions.push(actions.createAction(handler["resource-file"].uninstall,
- [resource, project_dir, plugin_id],
- handler["resource-file"].install,
+ actions.push(actions.createAction(handler["resource-file"].uninstall,
+ [resource, project_dir, plugin_id],
+ handler["resource-file"].install,
[resource, plugin_dir, project_dir]));
});
// CB-5238 custom frameworks only
frameworkFiles && frameworkFiles.forEach(function(framework) {
- actions.push(actions.createAction(handler["framework"].uninstall,
- [framework, project_dir, plugin_id],
- handler["framework"].install,
+ actions.push(actions.createAction(handler["framework"].uninstall,
+ [framework, project_dir, plugin_id],
+ handler["framework"].install,
[framework, plugin_dir, project_dir]));
});
libFiles && libFiles.forEach(function(source) {
- actions.push(actions.createAction(handler["lib-file"].uninstall,
- [source, project_dir, plugin_id],
- handler["lib-file"].install,
+ actions.push(actions.createAction(handler["lib-file"].uninstall,
+ [source, project_dir, plugin_id],
+ handler["lib-file"].install,
[source, plugin_dir, project_dir, plugin_id]));
});
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 818b785..67adfb6 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -39,7 +39,7 @@ var fs = require('fs'),
bplist = require('bplist-parser'),
xcode = require('xcode'),
et = require('elementtree'),
- _ = require('underscore'),
+ _ = require('underscore'),
xml_helpers = require('./../util/xml-helpers'),
platforms = require('./../platforms'),
events = require('./../events'),
@@ -132,7 +132,7 @@ PlatformMunger.prototype.apply_file_munge = PlatformMunger_apply_file_munge;
function PlatformMunger_apply_file_munge(file, munge, remove) {
var self = this;
var xml_child;
-
+
if ( file === 'framework' && self.platform === 'ios' ) {
// ios pbxproj file
var pbxproj = self.config_keeper.get(self.project_dir, self.platform, 'framework');
@@ -275,7 +275,7 @@ function reapply_global_munge () {
continue;
}
- self.apply_file_munge(file, global_munge.files[file]);
+ self.apply_file_munge(file, global_munge.files[file]);
}
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/csproj.js
----------------------------------------------------------------------
diff --git a/src/util/csproj.js b/src/util/csproj.js
index 01a5fbf..1024878 100644
--- a/src/util/csproj.js
+++ b/src/util/csproj.js
@@ -13,7 +13,7 @@ csproj.prototype = {
write:function() {
fs.writeFileSync(this.location, this.xml.write({indent:4}), 'utf-8');
},
-
+
addReference:function(relPath) {
var item = new et.Element('ItemGroup');
var extName = path.extname(relPath);
@@ -33,10 +33,10 @@ csproj.prototype = {
}
item.append(elem);
-
+
this.xml.getroot().append(item);
},
-
+
removeReference:function(relPath) {
var item = new et.Element('ItemGroup');
var extName = path.extname(relPath);
@@ -60,7 +60,7 @@ csproj.prototype = {
if(extName == ".xaml") {
var page = new et.Element('Page');
var sub_type = new et.Element('SubType');
-
+
sub_type.text = "Designer";
page.append(sub_type);
page.attrib.Include = relative_path;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/default-engines.js
----------------------------------------------------------------------
diff --git a/src/util/default-engines.js b/src/util/default-engines.js
index 926c206..5e4f151 100644
--- a/src/util/default-engines.js
+++ b/src/util/default-engines.js
@@ -2,35 +2,35 @@ var path = require('path');
module.exports = function(project_dir){
return {
- 'cordova':
+ 'cordova':
{ 'platform':'*', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-plugman':
+ 'cordova-plugman':
{ 'platform':'*', 'currentVersion': require('../../package.json').version },
- 'cordova-android':
+ 'cordova-android':
{ 'platform':'android', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-ios':
+ 'cordova-ios':
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-blackberry10':
+ 'cordova-blackberry10':
{ 'platform':'blackberry10', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-wp7':
+ 'cordova-wp7':
{ 'platform':'wp7', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-wp8':
+ 'cordova-wp8':
{ 'platform':'wp8', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-windows8':
+ 'cordova-windows8':
{ 'platform':'windows8', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'apple-xcode' :
+ 'apple-xcode' :
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','apple_xcode_version') },
- 'apple-ios' :
+ 'apple-ios' :
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','apple_ios_version') },
- 'apple-osx' :
+ 'apple-osx' :
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','apple_osx_version') },
- 'blackberry-ndk' :
+ 'blackberry-ndk' :
{ 'platform':'blackberry10', 'scriptSrc': path.join(project_dir,'cordova','bb10-ndk-version') },
- 'android-sdk' :
+ 'android-sdk' :
{ 'platform':'android', 'scriptSrc': path.join(project_dir,'cordova','android_sdk_version') },
- 'windows-os' :
+ 'windows-os' :
{ 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_os_version') },
- 'windows-sdk' :
- { 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_sdk_version') }
+ 'windows-sdk' :
+ { 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_sdk_version') }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/dependencies.js
----------------------------------------------------------------------
diff --git a/src/util/dependencies.js b/src/util/dependencies.js
index 8abbc5b..a297372 100644
--- a/src/util/dependencies.js
+++ b/src/util/dependencies.js
@@ -93,4 +93,4 @@ module.exports = package = {
danglers = danglers && danglers.filter(function(x) { return tlps.indexOf(x) < 0; });
return danglers;
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/plist-helpers.js
----------------------------------------------------------------------
diff --git a/src/util/plist-helpers.js b/src/util/plist-helpers.js
index 206d7a6..e1dfbd9 100644
--- a/src/util/plist-helpers.js
+++ b/src/util/plist-helpers.js
@@ -21,7 +21,7 @@
var et = require('elementtree'),
plist = require('plist-with-patches');
-
+
// adds node to doc at selector
module.exports = {
graftPLIST:function (doc, xml, selector) {
@@ -38,7 +38,7 @@ module.exports = {
// removes node from doc at selector
prunePLIST:function(doc, xml, selector) {
var obj = plist.parseStringSync("<plist>"+xml+"</plist>");
-
+
pruneOBJECT(doc, selector, obj);
return true;
@@ -51,9 +51,9 @@ function pruneOBJECT(doc, selector, fragment) {
for (i in fragment) {
for (j in doc[selector]) {
empty = pruneOBJECT(doc[selector], j, fragment[i]) && empty;
- }
+ }
}
- if (empty)
+ if (empty)
{
delete doc[selector];
return true;
@@ -63,7 +63,7 @@ function pruneOBJECT(doc, selector, fragment) {
delete doc[selector];
return true;
}
-
+
return false;
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/w8jsproj.js
----------------------------------------------------------------------
diff --git a/src/util/w8jsproj.js b/src/util/w8jsproj.js
index 8b06b23..903a214 100644
--- a/src/util/w8jsproj.js
+++ b/src/util/w8jsproj.js
@@ -75,7 +75,7 @@ jsproj.prototype = {
item.append(elem);
this.xml.getroot().append(item);
},
-
+
removeReference:function(relPath) {
events.emit('verbose','removeReference::' + relPath);
@@ -163,18 +163,18 @@ jsproj.prototype = {
else if(projectExt == ".csproj") {
projectTypeGuid = WinCSharpProjectTypeGUID;
}
-
+
if(!projectTypeGuid) {
throw new Error("unrecognized project type");
}
- var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
+ var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
projName + '", "' + relative_path + '",' +
'"' + projectGuid + '"\n\r EndProject\n\r';
solText = splitText[0] + preInsertText + "EndProject\n\r" + postInsertText + splitText[1];
fs.writeFileSync(solutionPath,solText,{encoding:"utf8"});
-
+
// Add the ItemGroup/ProjectReference to the cordova project :
// <ItemGroup><ProjectReference Include="blahblah.csproj"/></ItemGroup>
@@ -204,7 +204,7 @@ jsproj.prototype = {
else if(projectExt == ".csproj") {
projectTypeGuid = WinCSharpProjectTypeGUID;
}
-
+
if(!projectTypeGuid) {
throw new Error("unrecognized project type");
}
@@ -213,7 +213,7 @@ jsproj.prototype = {
projectGuid + "=" + projectGuid + "\n\r" +
"EndProjectSection\n\r";
- var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
+ var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
projName + '", "' + relative_path + '",' +
'"' + projectGuid + '"\n\r EndProject\n\r';
@@ -221,7 +221,7 @@ jsproj.prototype = {
var solutionPath = shell.ls(path.join(path.dirname(this.location),"*.sln"))[0]; // TODO:error handling
var solText = fs.readFileSync(solutionPath,{encoding:"utf8"});
var splitText = solText.split(preInsertText);
-
+
solText = splitText.join("").split(postInsertText);
solText = solText.join("");
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/xml-helpers.js
----------------------------------------------------------------------
diff --git a/src/util/xml-helpers.js b/src/util/xml-helpers.js
index 265025e..601ed4d 100644
--- a/src/util/xml-helpers.js
+++ b/src/util/xml-helpers.js
@@ -180,9 +180,9 @@ function resolveParent(doc, selector) {
return parent;
}
-// Find the index at which to insert an entry. After is a ;-separated priority list
-// of tags after which the insertion should be made. E.g. If we need to
-// insert an element C, and the rule is that the order of children has to be
+// Find the index at which to insert an entry. After is a ;-separated priority list
+// of tags after which the insertion should be made. E.g. If we need to
+// insert an element C, and the rule is that the order of children has to be
// As, Bs, Cs. After will be equal to "C;B;A".
function findInsertIdx(children, after) {