From b51b0e53501388ae479c34d4b4be1590f842e7ca Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Thu, 22 Jan 2015 13:00:59 -0500
Subject: [PATCH] code review

---
 src/js/messaging.js | 9 ++++-----
 src/js/pagestore.js | 9 ---------
 src/js/tab.js       | 2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/js/messaging.js b/src/js/messaging.js
index 0b6e5ab6b..9dd3ab373 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -375,6 +375,7 @@ var tagNameToRequestTypeMap = {
 
 var filterRequests = function(pageStore, details) {
     var µburi = µb.URI;
+    var isBlockResult = µb.isBlockResult;
 
     // Create evaluation context
     details.pageHostname = vAPI.punycodeHostname(details.pageHostname);
@@ -385,7 +386,7 @@ var filterRequests = function(pageStore, details) {
 
     var inRequests = details.requests;
     var outRequests = [];
-    var request, result;
+    var request;
     var i = inRequests.length;
     while ( i-- ) {
         request = inRequests[i];
@@ -395,8 +396,7 @@ var filterRequests = function(pageStore, details) {
         details.requestURL = vAPI.punycodeURL(request.url);
         details.requestHostname = µburi.hostnameFromURI(details.requestURL);
         details.requestType = tagNameToRequestTypeMap[request.tagName];
-        result = pageStore.filterRequest(details);
-        if ( pageStore.boolFromResult(result) ) {
+        if ( isBlockResult(pageStore.filterRequest(details)) ) {
             outRequests.push(request);
         }
     }
@@ -422,8 +422,7 @@ var filterRequest = function(pageStore, details) {
     details.requestURL = vAPI.punycodeURL(details.requestURL);
     details.requestHostname = µburi.hostnameFromURI(details.requestURL);
     details.requestType = tagNameToRequestTypeMap[details.tagName];
-    var result = pageStore.filterRequest(details);
-    if ( pageStore.boolFromResult(result) ) {
+    if ( µb.isBlockResult(pageStore.filterRequest(details)) ) {
         return { collapse: µb.userSettings.collapseBlocked };
     }
 };
diff --git a/src/js/pagestore.js b/src/js/pagestore.js
index b0ebb493f..0a2b9fb66 100644
--- a/src/js/pagestore.js
+++ b/src/js/pagestore.js
@@ -680,15 +680,6 @@ var collapsibleRequestTypes = 'image sub_frame object';
 
 /******************************************************************************/
 
-// false: not blocked
-// true: blocked
-
-PageStore.prototype.boolFromResult = function(result) {
-    return typeof result === 'string' && result.charAt(1) === 'b';
-};
-
-/******************************************************************************/
-
 PageStore.prototype.toMirrorURL = function(requestURL) {
     // https://github.com/gorhill/uBlock/issues/351
     // Bypass experimental features when uBlock is disabled for a site
diff --git a/src/js/tab.js b/src/js/tab.js
index 5cc3db40c..d729e3770 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -92,7 +92,7 @@ vAPI.tabs.onPopup = function(details) {
     }
 
     // Not blocked
-    if ( pageStore.boolFromResult(result) === false ) {
+    if ( µb.isAllowResult(result) ) {
         return;
     }