Merge pull request #10 from joelthorner/dev

v1.0.5
joelthorner · May 2, 2018 · 4308072 · 4308072
2 parents 8f00f39 + 8a57e0b
commit 4308072
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/js/executeUsingTabVars.js b/js/executeUsingTabVars.js
diff --git a/js/initOptions.js b/js/initOptions.js
@@ -11,22 +11,16 @@ function aplyUsernameOpt(value){
 
 	value = $.trim(value).toLowerCase();
 
-	switch (value){
-		case "joel.torner": 
-			$('body').addClass('jt');
-		break;
-		case "jordi.canizares": 
-			$('body').addClass('cani');
-		break;
-		case "carlos.garcia": 
-			$('body').addClass('carlos');
-		break;
-		case "cristina.ortega": 
-			$('body').addClass('orto');
-		break;
-		case "andrea": 
-			$('body').addClass('andrea');
-		break;
+	if (value.indexOf('joelthorner') !== -1 || value.indexOf('torner') !== -1) {
+		$('body').addClass('jt');
+	}else if(value.indexOf('jordi.canizares') !== -1 || value.indexOf('canizares') !== -1){
+		$('body').addClass('cani');
+	}else if(value.indexOf('carlos') !== -1 || value.indexOf('carlos.garcia') !== -1){
+		$('body').addClass('carlos');
+	}else if(value.indexOf('andrea') !== -1 || value.indexOf('sanabria') !== -1){
+		$('body').addClass('andrea');
+	}else if(value.indexOf('cristina.ortega') !== -1 || value.indexOf('ortega') !== -1){
+		$('body').addClass('orto');
 	}
 }
 
@@ -39,18 +33,18 @@ function aplyProfilePhotoOpt(value){
 
 // init options ------------------------------------------------------------------------------------------------
 chrome.storage.sync.get(['optBgLc'], function(result) {
-	var value = result.optProfilePhoto;
+	var value = result.optBgLc;
 	if ($.type(value) == 'undefined' || $.trim(value).length == 0){
 
 		value = $('#opt-bg-lc').val();
 		if ($.type(value) == 'undefined' || $.trim(value).length == 0)
 			value = DEFAULTS.optBgLc;
 
 		chrome.storage.sync.set({optBgLc: value }, function() {
-			$('#opt-bg-lc').val(result.optBgLc);
+			$('#opt-bg-lc').val(value);
 		});
 	}else{
-		$('#opt-bg-lc').val(result.optBgLc);
+		$('#opt-bg-lc').val(value);
 	}
 });
 chrome.storage.sync.get(['optProfilePhoto'], function(result) {
@@ -81,7 +75,7 @@ chrome.storage.sync.get(['userName'], function(result) {
 			aplyUsernameOpt(value);
 		});
 	}else{
-		aplyUsernameOpt(result.userName);
+		aplyUsernameOpt(value);
 	}
 });
 // end init options --------------------------------------------------------------------------------------------
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "TLmanaGer",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "manifest_version": 2,
   "description": "Desarrollamiento tool",
   "homepage_url": "https://github.com/joelthorner",

diff --git a/src/browser_action/browser_action.html b/src/browser_action/browser_action.html
@@ -12,7 +12,7 @@
 		<header class="clearfix">
 			<img src="../../img/iceberg.svg">
 			<div class="cont">
-				<span id="p-username"><strong>TLmanaGer</strong><span class="badge badge-pill badge-primary">v1.0.4</span></span>
+				<span id="p-username"><strong>TLmanaGer</strong><span class="badge badge-pill badge-primary">v1.0.5</span></span>
 				<span id="p-mail">Hello, <span id="userNameRes">joelthorner</span></span>
 			</div>
 			<a href="/src/options/index.html" class="icon sett" title="Settings">