Preparation for 3.0 release

maripo · Aug 28, 2018 · e433ca1 · e433ca1 · IMS-Studio · Aug 28, 2018
1 parent 01e5830
commit e433ca1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/extension/pref/index.html b/extension/pref/index.html
@@ -188,7 +188,9 @@ <h3>
 			<div class="bottom_button_container">
         <input type="button" value="Save" class="uiButton"
           id="rule_editor_save_button" />
+          <div style="display:none">
         <input type="checkbox" id="rule_editor_save_merge_checkbox" />merge
+        </div>
 			</div>
 		</div>
 		<div id="ruleListContainer">

diff --git a/extension/src/contentscript.js b/extension/src/contentscript.js
diff --git a/ts/src/contentscript.ts b/ts/src/contentscript.ts
@@ -49,12 +49,11 @@ class BackgroundCommunicator {
 		}
 	}
 	execInit (request) {
-		cbStorage.loadAll(function(allRules:[Rule]){
-			if (window.customBlockerInitDone) return;
-			window.customBlockerInitDone = true;
-			rules = new Array();
-			RuleExecutor.checkRules(allRules);
-		});
+		let allRules = request.rules;
+		if (window.customBlockerInitDone) return;
+		window.customBlockerInitDone = true;
+		rules = new Array();
+		RuleExecutor.checkRules(allRules);
 	}
 
 	execHighlight (request) {

diff --git a/ts/src/db/DbObj.ts b/ts/src/db/DbObj.ts
@@ -5,7 +5,6 @@ class DbColumn {
 	version:any;
 	properties:any;
 
-	// TODO replace with enum
 	static readonly TYPE_PKEY = 1;
 	static readonly TYPE_INTEGER = 2;
 	static readonly TYPE_TEXT = 3;