diff --git a/js/messaging-handlers.js b/js/messaging-handlers.js index e5ce663b7..9f3760c2d 100644 --- a/js/messaging-handlers.js +++ b/js/messaging-handlers.js @@ -291,7 +291,7 @@ var getPageDetails = function(µb, tabId) { }); } return r; - } + }; var hasher = new YaMD5(); if ( µb.userSettings.logBlockedRequests ) { r.blockedRequests = prepareRequests(pageStore.blockedRequests, hasher); diff --git a/js/popup.js b/js/popup.js index 7e6c94c5e..b3a18f345 100644 --- a/js/popup.js +++ b/js/popup.js @@ -19,6 +19,8 @@ Home: https://github.com/gorhill/uBlock */ +/* global chrome, messaging, uDom */ + /******************************************************************************/ /******************************************************************************/ @@ -36,7 +38,7 @@ messaging.start('popup.js'); /******************************************************************************/ -formatNumber = function(count) { +var formatNumber = function(count) { if ( typeof count !== 'number' ) { return ''; } @@ -70,7 +72,7 @@ var renderStats = function() { uDom('#gotoLog').toggleClass( 'enabled', - stats.logBlockedRequests || stats.logAllowedRequests + stats.netFilteringSwitch && (stats.logBlockedRequests || stats.logAllowedRequests) ); var blocked = stats.pageBlockedRequestCount; diff --git a/js/stats.js b/js/stats.js index 5f6a430bf..021199c76 100644 --- a/js/stats.js +++ b/js/stats.js @@ -209,7 +209,8 @@ var renderPageSelector = function(targetTabId) { for ( var i = 0; i < pageSelectors.length; i++ ) { chrome.tabs.get(parseInt(pageSelectors[i], 10), onTabReceived); } - if ( selectedTabId ) { + uDom('#requests').toggleClass('empty', pageSelectors.length === 0); + if ( pageSelectors.length > 0 ) { renderPageDetails(selectedTabId); } }; diff --git a/js/udom.js b/js/udom.js index 46c4efb07..0ecee11fd 100644 --- a/js/udom.js +++ b/js/udom.js @@ -145,7 +145,7 @@ DOMList.prototype.subset = function(i, l) { var n = l !== undefined ? l : 1; var j = Math.min(i + n, this.nodes.length); if ( i < j ) { - r.nodes = this.nodes.slice(i, j) + r.nodes = this.nodes.slice(i, j); } return r; }; @@ -167,7 +167,7 @@ DOMList.prototype.node = function(i) { DOMList.prototype.parent = function() { var r = new DOMList(); if ( this.nodes.length ) { - addNodeToList(r, this.nodes[0].parentNode) + addNodeToList(r, this.nodes[0].parentNode); } return r; }; @@ -180,7 +180,7 @@ DOMList.prototype.find = function(selector) { var nl; for ( var i = 0; i < n; i++ ) { nl = this.nodes[i].querySelectorAll(selector); - addNodeListToList(r, nl) + addNodeListToList(r, nl); } return r; }; @@ -416,7 +416,7 @@ DOMList.prototype.toggleClass = function(className, targetState) { for ( var i = 0; i < n; i++ ) { node = this.nodes[i]; currentState = re.test(node.className); - newState = !!targetState; + newState = targetState; if ( newState === undefined ) { newState = !currentState; } diff --git a/manifest.json b/manifest.json index d8b54485e..004accc2d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "µBlock", - "version": "0.1.3.4", + "version": "0.1.4.0", "description": "__MSG_extShortDesc__", "icons": { "16": "img/icon_16.png", diff --git a/stats.html b/stats.html index e36d5055e..4f8e16eaf 100644 --- a/stats.html +++ b/stats.html @@ -23,6 +23,7 @@ ul { select { padding: 2px 0; font-size: 14px; + min-width: 20em; } #requests { margin: 2em 0 0 0; @@ -31,13 +32,16 @@ select { #requests.logEnabled { display: block; } -table { +#requests table { margin: 1em 0; border: 1px solid gray; font: 12px mono; border-collapse: collapse; min-width: 600px; } +#requests.empty table { + display: none; + } td, th { border: 1px solid #aaa; padding: 6px 6px;