aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDeathamns <deathamns@gmail.com>2015-03-11 15:32:42 +0100
committerDeathamns <deathamns@gmail.com>2015-03-11 15:32:42 +0100
commit415846e3266a051de5e4c2ec08cd03a57b1aacff (patch)
tree2c6e4c37e4d3126e2c39ae1d9948d33896148d6a /src
parent10f656f8fe6d1318b7655300694b5bd7c3b8ec2b (diff)
parent825adfa80e428d9fee327965f15a3f17a0252d4e (diff)
downloaduBlock-415846e3266a051de5e4c2ec08cd03a57b1aacff.zip
uBlock-415846e3266a051de5e4c2ec08cd03a57b1aacff.tar.gz
uBlock-415846e3266a051de5e4c2ec08cd03a57b1aacff.tar.bz2
Merge pull request #956 from AlexVallat/master
UI for Fennec (Firefox for Android)
Diffstat (limited to 'src')
-rw-r--r--src/_locales/en/messages.json12
-rw-r--r--src/dashboard.html2
-rw-r--r--src/devtools.html2
-rw-r--r--src/js/messaging.js15
-rw-r--r--src/js/popup.js30
-rw-r--r--src/popup.html3
6 files changed, 50 insertions, 14 deletions
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 83dc11e..145c33f 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -555,6 +555,18 @@
"message":"{{value}} days ago",
"description":"English: {{value}} days ago"
},
+ "showDashboardButton":{
+ "message":"Show Dashboard",
+ "description":"English: Show Dashboard"
+ },
+ "showNetworkLogButton":{
+ "message":"Show Network Request Log",
+ "description":"English: Show Network Request Log"
+ },
+ "fennecMenuItemBlockingOff": {
+ "message": "off",
+ "description": "Appears as µBlock (off)"
+ },
"dummy":{
"message":"This entry must be the last one",
"description":"so we dont need to deal with comma for last entry"
diff --git a/src/dashboard.html b/src/dashboard.html
index ac7e5a6..8f68c21 100644
--- a/src/dashboard.html
+++ b/src/dashboard.html
@@ -2,6 +2,8 @@
<html>
<head>
<meta charset="utf-8">
+<meta name="viewport" content="initial-scale=1">
+
<title data-i18n="dashboardName"></title>
<link href="css/dashboard.css" rel="stylesheet" type="text/css">
<link href="css/common.css" rel="stylesheet" type="text/css">
diff --git a/src/devtools.html b/src/devtools.html
index 2928899..f2daaec 100644
--- a/src/devtools.html
+++ b/src/devtools.html
@@ -2,6 +2,8 @@
<html>
<head>
<meta charset="utf-8">
+<meta name="viewport" content="initial-scale=1">
+
<title data-i18n="statsPageName"></title>
<link rel="stylesheet" type="text/css" href="css/common.css">
<link rel="stylesheet" type="text/css" href="css/devtools.css">
diff --git a/src/js/messaging.js b/src/js/messaging.js
index 1afd993..71c2fa4 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -78,6 +78,9 @@ var onMessage = function(request, sender, callback) {
case 'reloadTab':
if ( vAPI.isNoTabId(request.tabId) === false ) {
vAPI.tabs.reload(request.tabId);
+ if (request.select && vAPI.tabs.select) {
+ vAPI.tabs.select(request.tabId);
+ }
}
break;
@@ -195,7 +198,7 @@ var getFirewallRules = function(srcHostname, desHostnames) {
/******************************************************************************/
-var getStats = function(tabId) {
+var getStats = function(tabId, tabTitle) {
var r = {
advancedUserEnabled: µb.userSettings.advancedUserEnabled,
appName: vAPI.app.name,
@@ -209,7 +212,8 @@ var getStats = function(tabId) {
pageURL: '',
pageAllowedRequestCount: 0,
pageBlockedRequestCount: 0,
- tabId: tabId
+ tabId: tabId,
+ tabTitle: tabTitle
};
var pageStore = µb.pageStoreFromTabId(tabId);
if ( pageStore ) {
@@ -277,8 +281,8 @@ var onMessage = function(request, sender, callback) {
// Async
switch ( request.what ) {
case 'getPopupData':
- vAPI.tabs.get(null, function(tab) {
- callback(getStats(getTargetTabId(tab)));
+ vAPI.tabs.get(request.tabId, function(tab) {
+ callback(getStats(getTargetTabId(tab), tab.title));
});
return;
@@ -296,6 +300,9 @@ var onMessage = function(request, sender, callback) {
µb.contextMenuClientX = -1;
µb.contextMenuClientY = -1;
µb.elementPickerExec(request.tabId);
+ if (request.select && vAPI.tabs.select) {
+ vAPI.tabs.select(request.tabId);
+ }
break;
case 'hasPopupContentChanged':
diff --git a/src/js/popup.js b/src/js/popup.js
index ded7ba1..291dd47 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -363,7 +363,10 @@ var renderPrivacyExposure = function() {
// Assume everything has to be done incrementally.
-var renderPopup = function() {
+var renderPopup = function () {
+ if (popupData.tabTitle) {
+ document.title = popupData.appName + " - " + popupData.tabTitle;
+ }
uDom('#appname').text(popupData.appName);
uDom('#version').text(popupData.appVersion);
uDom('body').toggleClass('advancedUser', popupData.advancedUserEnabled);
@@ -449,8 +452,9 @@ var toggleNetFilteringSwitch = function(ev) {
var gotoPick = function() {
messager.send({
what: 'gotoPick',
- tabId: popupData.tabId
- });
+ tabId: popupData.tabId,
+ select: true
+});
vAPI.closePopup();
};
@@ -577,7 +581,7 @@ var setFirewallRuleHandler = function(ev) {
/******************************************************************************/
var reloadTab = function() {
- messager.send({ what: 'reloadTab', tabId: popupData.tabId });
+ messager.send({ what: 'reloadTab', tabId: popupData.tabId, select: true });
// Polling will take care of refreshing the popup content
@@ -651,7 +655,7 @@ var pollForContentChange = (function() {
var queryCallback = function(response) {
if ( response ) {
- getPopupData();
+ getPopupData(popupData.tabId);
return;
}
poll();
@@ -669,22 +673,30 @@ var pollForContentChange = (function() {
/******************************************************************************/
-var getPopupData = function() {
+var getPopupData = function(tabId) {
var onDataReceived = function(response) {
cachePopupData(response);
renderPopup();
hashFromPopupData(true);
pollForContentChange();
};
- messager.send({ what: 'getPopupData' }, onDataReceived);
+ messager.send({ what: 'getPopupData', tabId: tabId }, onDataReceived);
};
/******************************************************************************/
// Make menu only when popup html is fully loaded
-uDom.onLoad(function() {
- getPopupData();
+uDom.onLoad(function () {
+ var tabId = null; //If there's no tab ID specified in the query string, it will default to current tab.
+
+ // Extract the tab id of the page this popup is for
+ var matches = window.location.search.match(/[\?&]tabId=([^&]+)/);
+ if (matches && matches.length === 2) {
+ tabId = matches[1];
+ }
+
+ getPopupData(tabId);
uDom('#switch').on('click', toggleNetFilteringSwitch);
uDom('#gotoPick').on('click', gotoPick);
uDom('a[href]').on('click', gotoURL);
diff --git a/src/popup.html b/src/popup.html
index 252d133..b3bf5af 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -1,7 +1,8 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<html>
<head>
+<meta name="viewport" content="width=470"> <!-- When showing as a tab in fennec, scale to full size (150px + 320px)-->
<meta charset="utf-8">
<link rel="stylesheet" href="css/common.css" type="text/css">
<link rel="stylesheet" href="css/popup.css" type="text/css">
generated by cgit v1.1 at 2025-02-04 03:27:38 +0000