Skip to content
Permalink
Browse files
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
  • Loading branch information
kamrik committed Apr 24, 2014
1 parent b0d0782 commit 8aca4cb5b1a8012aa23ba05386d10cb59b3b4817
Show file tree
Hide file tree
Showing 23 changed files with 109 additions and 109 deletions.
@@ -30,7 +30,7 @@ if(opt.debug) {
}

module.exports = common = {
spy: {
spy: {
getInstall: function(emitSpy){
return common.spy.startsWith(emitSpy, 'Install start');
},
@@ -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;

@@ -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!');
});
});
@@ -304,17 +304,17 @@ 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'));
});
it('should call into xcodeproj\'s removeFramework appropriately when element framework=true set', 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'));
});
@@ -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() {
@@ -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() {
@@ -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() {
@@ -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)
@@ -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');
});
@@ -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,
@@ -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);
@@ -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');
}
}
}
};
@@ -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.
@@ -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);
@@ -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');
}
}
}
};

0 comments on commit 8aca4cb

Please sign in to comment.