Cleaned manageOverride

Strav · Mar 26, 2010 · 384f455 · 384f455
1 parent 69a14bb
commit 384f455
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/background_page.html b/background_page.html
@@ -44,19 +44,18 @@
 	me.blnOverrides[overrideType] = me.Overrides[overrideType].indexOf(path) != -1;
     }
 
-    me.manageOverride = function (overrideType, blnValue, localStorageValue, addOrRemove, CSSfn){
-	if(overrideType != 'OverrideAll'){
-	    if(addOrRemove == 'add'){
-		me.Overrides[overrideType].push(localStorageValue);
-	    }
-	    else{
-		me.Overrides[overrideType].splice(me.Overrides[overrideType].indexOf(localStorageValue),1);
-	    }
-	}
-	else{
+    me.manageOverride = function (overrideType, blnValue, localStorageValue, action, CSSfn){
+	switch(action){
+	case 'add':
+	    me.Overrides[overrideType].push(localStorageValue);
+	    break;
+	case 'remove':
+	    me.Overrides[overrideType].splice(me.Overrides[overrideType].indexOf(localStorageValue),1);
+	    break;
+	case 'set':
 	    me.Overrides[overrideType] = localStorageValue;
+	    break;
 	}
-
 	localStorage[overrideType]  = JSON.stringify(me.Overrides[overrideType]);
 	me.blnOverrides[overrideType] = blnValue;
 	CSSfn();
@@ -201,9 +200,9 @@
 	  break;
       case "overrideAll":
 	  if(IsOverrideAll)
-	      objCurrentPage.manageOverride('OverrideAll', false, false, null, me.callRemoveCss);
+	      objCurrentPage.manageOverride('OverrideAll', false, false, 'set', me.callRemoveCss);
 	  else
-	      objCurrentPage.manageOverride('OverrideAll', true, true, null, me.callInjectCss);
+	      objCurrentPage.manageOverride('OverrideAll', true, true, 'set', me.callInjectCss);
 	  break;
       }
   }
@@ -213,4 +212,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>
diff --git a/popup.html b/popup.html
@@ -47,10 +47,10 @@
 	else{
 	    ChangeBtnState('domainOverriden', 'No global override on this domain', 'NotOverridenDomains', true, currentDomain, 'add', objCurrentPage.callRemoveCss);
 	}
-	ChangeBtnState('overrideAll', 'Remove override on all pages', 'OverrideAll', false, false, null, objCurrentPage.callRemoveCss);
+	ChangeBtnState('overrideAll', 'Remove override on all pages', 'OverrideAll', false, false, 'set', objCurrentPage.callRemoveCss);
     }
     else{
-	ChangeBtnState('overrideAll', 'Apply override on all pages', 'OverrideAll', true, true, null, objCurrentPage.callInjectCss);
+	ChangeBtnState('overrideAll', 'Apply override on all pages', 'OverrideAll', true, true, 'set', objCurrentPage.callInjectCss);
     }
 }