Use global namespace for importers

js/importers/import-main.js

@@ -1,9 +1,9 @@
-// Importers should always start with this
+var PassmanImporter = PassmanImporter || {};
-if(!window['PassmanImporter']){
+(function(window, $, PassmanImporter) {
-	var PassmanImporter = {}
+	'use strict';
-}
 
-PassmanImporter.parseRow_ = function(row) {
+
+	PassmanImporter.parseRow_ = function(row) {
 		// Strip leading quote.
 		row = row.trim();
 		var isQuoted = false;
@@ -23,13 +23,13 @@ PassmanImporter.parseRow_ = function(row) {
 			row = row.split(',');
 		}
 		return row;
-};
+	};
-PassmanImporter.htmlDecode = function(input){
+	PassmanImporter.htmlDecode = function(input){
 		var e = document.createElement('div');
 		e.innerHTML = input;
 		return e.childNodes[0].nodeValue;
-};
+	};
-PassmanImporter.toObject_ = function(headings, row) {
+	PassmanImporter.toObject_ = function(headings, row) {
 		var result = {};
 		for (var i = 0, ii = row.length; i < ii; i++) {
 			headings[i] = headings[i].replace(',','_')
@@ -39,17 +39,17 @@ PassmanImporter.toObject_ = function(headings, row) {
 			result[headings[i]] = row[i];
 		}
 		return result;
-};
+	};
 
-PassmanImporter.join_ = function(arr, sep) {
+	PassmanImporter.join_ = function(arr, sep) {
 		var parts = [];
 		for (var i = 0, ii = arr.length; i < ii; i++) {
 			arr[i] && parts.push(arr[i]);
 		}
 		return parts.join(sep);
-};
+	};
 
-PassmanImporter.newCredential = function () {
+	PassmanImporter.newCredential = function () {
 		var credential = {
 			'credential_id': null,
 			'guid': null,
@@ -73,9 +73,9 @@ PassmanImporter.newCredential = function () {
 			'hidden': false
 		};
 		return credential;
-};
+	};
 
-PassmanImporter.readCsv = function( csv, hasHeadings ){
+	PassmanImporter.readCsv = function( csv, hasHeadings ){
 		hasHeadings = (hasHeadings === undefined) ? true : hasHeadings;
 		var lines = [];
 		var rows = csv.split('\n');
@@ -91,8 +91,9 @@ PassmanImporter.readCsv = function( csv, hasHeadings ){
 			}
 		}
 		return lines;
-};
+	};
 
-PassmanImporter.readJson = function (string){
+	PassmanImporter.readJson = function (string){
 		return JSON.parse(string);
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-clipperz.js

@@ -1,17 +1,16 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+(function(window, $, PassmanImporter) {
-}
+	'use strict';
-// Define the importer
+	PassmanImporter.clippers = {
-PassmanImporter.clippers = {
 		info: {
 			name: 'Clipperz.is',
 			id: 'clippers',
 			description: 'Go to menu -> Export -> Download HTML + JSON. Fields will be imported as custom fields.'
 		}
-};
+	};
 
-PassmanImporter.clippers.readFile = function (file_data) {
+	PassmanImporter.clippers.readFile = function (file_data) {
 		return new C_Promise(function() {
 			var credential_list = [];
 			var re = /<textarea>(.*?)<\/textarea>/gi;
@@ -55,4 +54,5 @@ PassmanImporter.clippers.readFile = function (file_data) {
 			}
 			this.call_then(credential_list);
 		});
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-dashlanecsv.js

@@ -1,17 +1,17 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+(function(window, $, PassmanImporter) {
-}
+	'use strict';
-// Define the importer
+	// Define the importer
-PassmanImporter.dashLaneCsv = {
+	PassmanImporter.dashLaneCsv = {
 		info: {
 			name: 'Dashlane 4 csv',
 			id: 'dashLaneCsv',
 			description: 'Create an csv export. Go to File -> export -> Unsecured archive (readable) in CSV format'
 		}
-};
+	};
 
-PassmanImporter.dashLaneCsv.readFile = function (file_data) {
+	PassmanImporter.dashLaneCsv.readFile = function (file_data) {
 		return new C_Promise(function(){
 			var rows = file_data.split('\n');
 			var credential_list = [];
@@ -45,4 +45,5 @@ PassmanImporter.dashLaneCsv.readFile = function (file_data) {
 			}
 			this.call_then(credential_list);
 		});
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-keepasscsv.js

@@ -1,17 +1,17 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+(function(window, $, PassmanImporter) {
-}
+	'use strict';
-// Define the importer
+	// Define the importer
-PassmanImporter.keepassCsv = {
+	PassmanImporter.keepassCsv = {
 		info: {
 			name: 'KeePass csv',
 			id: 'keepassCsv',
 			description: 'Create an csv export with the following options enabled: http://i.imgur.com/CaeTA4d.png'
 		}
-};
+	};
 
-PassmanImporter.keepassCsv.readFile = function (file_data) {
+	PassmanImporter.keepassCsv.readFile = function (file_data) {
 		var p = new C_Promise(function(){
 			var parsed_csv = PassmanImporter.readCsv(file_data);
 			var credential_list = [];
@@ -47,4 +47,5 @@ PassmanImporter.keepassCsv.readFile = function (file_data) {
 			this.call_then(credential_list);
 		});
 		return p;
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-lastpasscsv.js

@@ -1,17 +1,17 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+(function(window, $, PassmanImporter) {
-}
+	'use strict';
-// Define the importer
+	// Define the importer
-PassmanImporter.lastpassCsv = {
+	PassmanImporter.lastpassCsv = {
 		info: {
 			name: 'LastPass csv',
 			id: 'lastpassCsv',
 			description: 'Create an csv export. Go to More options -> Advanced -> Export -> Last Pass CSV File'
 		}
-};
+	};
 
-PassmanImporter.lastpassCsv.readFile = function (file_data) {
+	PassmanImporter.lastpassCsv.readFile = function (file_data) {
 		return new C_Promise(function(){
 			var parsed_csv = PassmanImporter.readCsv(file_data);
 			var credential_list = [];
@@ -36,4 +36,5 @@ PassmanImporter.lastpassCsv.readFile = function (file_data) {
 			}
 			this.call_then(credential_list)
 		});
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-passmanjson.js

@@ -1,17 +1,16 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+(function(window, $, PassmanImporter) {
-}
+	'use strict';
-// Define the importer
+	PassmanImporter.passmanJson = {
-PassmanImporter.passmanJson = {
 		info: {
 			name: 'Passman JSON',
 			id: 'passmanJson',
 			description: 'Export the item in passman as passman json, with all fields enabled'
 		}
-};
+	};
 
-PassmanImporter.passmanJson.readFile = function (file_data) {
+	PassmanImporter.passmanJson.readFile = function (file_data) {
 		return new C_Promise(function(){
 			var parsed_json = PassmanImporter.readJson(file_data);
 			var credential_list = [];
@@ -67,4 +66,5 @@ PassmanImporter.passmanJson.readFile = function (file_data) {
 			}
 			this.call_then(credential_list);
 		});
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-passpackcsv.js

@@ -1,17 +1,17 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+(function(window, $, PassmanImporter) {
-}
+	'use strict';
-// Define the importer
+	// Define the importer
-PassmanImporter.passpackCsv = {
+	PassmanImporter.passpackCsv = {
 		info: {
 			name: 'Passpack csv',
 			id: 'passpackCsv',
 			description: 'Go to Tools -> Export. Select Comma Separated Values, All entries then continue.'
 		}
-};
+	};
 
-PassmanImporter.passpackCsv.readFile = function (file_data) {
+	PassmanImporter.passpackCsv.readFile = function (file_data) {
 		return new C_Promise(function(){
 			var parsed_csv = PassmanImporter.readCsv(file_data, false);
 			var credential_list = [];
@@ -49,4 +49,5 @@ PassmanImporter.passpackCsv.readFile = function (file_data) {
 			}
 			this.call_then(credential_list);
 		})
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-randomdata.js

@@ -1,17 +1,19 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+(function(window, $, PassmanImporter) {
-}
+	'use strict';
+	// Define the importer
+
 // Define the importer
-PassmanImporter.randomData = {
+	PassmanImporter.randomData = {
 		info: {
 			name: 'Random data',
 			id: 'randomData',
 			description: 'Create\'s 50 random credentials for testing purposes.'
 		}
-};
+	};
 
-PassmanImporter.randomData.readFile = function () {
+	PassmanImporter.randomData.readFile = function () {
 		return new C_Promise(function () {
 			var tags =
 				['Social media',
@@ -91,4 +93,5 @@ PassmanImporter.randomData.readFile = function () {
 				_this.call_then(credential_list);
 			});
 		});
-};
+	};
+})(window, $, PassmanImporter);

js/importers/importer-zohocsv.js

@@ -1,17 +1,19 @@
 // Importers should always start with this
-if (!window['PassmanImporter']) {
+var PassmanImporter = PassmanImporter || {};
-	var PassmanImporter = {}
+
-}
+(function(window, $, PassmanImporter) {
-// Define the importer
+	'use strict';
-PassmanImporter.zohoCsv = {
+
+	// Define the importer
+	PassmanImporter.zohoCsv = {
 		info: {
 			name: 'ZOHO csv',
 			id: 'zohoCsv',
 			description: 'Create an csv export. Go to Tools ->  Export secrets -> Select "General CSV" and click "Export Secrets"'
 		}
-};
+	};
 
-PassmanImporter.zohoCsv.readFile = function (file_data) {
+	PassmanImporter.zohoCsv.readFile = function (file_data) {
 		return new C_Promise(function(){
 			var parsed_csv = PassmanImporter.readCsv(file_data, false);
 			var credential_list = [];
@@ -37,4 +39,5 @@ PassmanImporter.zohoCsv.readFile = function (file_data) {
 			}
 			this.call_then(credential_list);
 		})
-};
+	};
+})(window, $, PassmanImporter);