[Pkg-mozext-commits] [adblock-plus] 31/87: Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240
David Prévot
taffit at moszumanska.debian.org
Sat Apr 30 17:59:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit 2b1943d0c393f32099da481187130674f9eb5cb1
Author: Wladimir Palant <trev at adblockplus.org>
Date: Sat Mar 19 19:56:43 2016 +0100
Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240
---
chrome/content/ui/filters-backup.js | 2 +-
chrome/content/ui/filters-filteractions.js | 2 +-
chrome/content/ui/filters-subscriptionactions.js | 4 ++--
chrome/content/ui/filters-subscriptionview.js | 22 ++++++++++++++++++++--
chrome/content/ui/filters.js | 1 +
chrome/content/ui/filters.xul | 6 +++---
chrome/content/ui/sendReport.js | 6 +++---
chrome/content/ui/sidebar.js | 8 ++++----
chrome/content/ui/utils.js | 19 +++++++++++++++++++
dependencies | 2 +-
10 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/chrome/content/ui/filters-backup.js b/chrome/content/ui/filters-backup.js
index 51bb9ba..95d208d 100644
--- a/chrome/content/ui/filters-backup.js
+++ b/chrome/content/ui/filters-backup.js
@@ -299,7 +299,7 @@ var Backup =
let typeAddition = "";
if (subscription.defaults)
typeAddition = "/" + subscription.defaults.join("/");
- list.push("! [" + subscription.title + "]" + typeAddition);
+ list.push("! [" + getSubscriptionTitle(subscription) + "]" + typeAddition);
for (let j = 0; j < subscription.filters.length; j++)
{
let filter = subscription.filters[j];
diff --git a/chrome/content/ui/filters-filteractions.js b/chrome/content/ui/filters-filteractions.js
index 6469ab7..b022a80 100644
--- a/chrome/content/ui/filters-filteractions.js
+++ b/chrome/content/ui/filters-filteractions.js
@@ -366,7 +366,7 @@ var FilterActions =
E("tooltip-additional").hidden = false;
if (item.filter instanceof InvalidFilter && item.filter.reason)
- E("tooltip-additional").textContent = item.filter.reason;
+ E("tooltip-additional").textContent = Utils.getString(item.filter.reason);
else if (item.filter instanceof RegExpFilter && defaultMatcher.isSlowFilter(item.filter))
E("tooltip-additional").textContent = Utils.getString("filter_regexp_tooltip");
else
diff --git a/chrome/content/ui/filters-subscriptionactions.js b/chrome/content/ui/filters-subscriptionactions.js
index 38b82fe..7ea754a 100644
--- a/chrome/content/ui/filters-subscriptionactions.js
+++ b/chrome/content/ui/filters-subscriptionactions.js
@@ -295,7 +295,7 @@ var SubscriptionActions =
event.dataTransfer.addElement(node);
event.dataTransfer.setData("text/x-moz-url", data.subscription.url);
- event.dataTransfer.setData("text/plain", data.subscription.title);
+ event.dataTransfer.setData("text/plain", getSubscriptionTitle(data.subscription));
this.dragSubscription = data.subscription;
event.stopPropagation();
},
@@ -422,7 +422,7 @@ var TitleEditor =
subscriptionNode.getElementsByClassName("titleBox")[0].selectedIndex = 1;
let editor = subscriptionNode.getElementsByClassName("titleEditor")[0];
- editor.value = subscription.title;
+ editor.value = getSubscriptionTitle(subscription);
editor.setSelectionRange(0, editor.value.length);
this.subscriptionEdited = subscriptionNode;
editor.focus();
diff --git a/chrome/content/ui/filters-subscriptionview.js b/chrome/content/ui/filters-subscriptionview.js
index 647fedf..e950a09 100644
--- a/chrome/content/ui/filters-subscriptionview.js
+++ b/chrome/content/ui/filters-subscriptionview.js
@@ -113,7 +113,8 @@ ListManager.prototype =
subscription: subscription,
isExternal: subscription instanceof ExternalSubscription,
downloading: Synchronizer.isExecuting(subscription.url),
- disabledFilters: disabledFilters
+ disabledFilters: disabledFilters,
+ upgradeRequired: ListManager.isUpgradeRequired(subscription)
});
if (insertBefore)
this._list.insertBefore(node, insertBefore);
@@ -252,7 +253,9 @@ ListManager.prototype =
let subscriptionNode = Templater.getNodeForData(this._list, "subscription", item);
if (subscriptionNode)
{
- Templater.getDataForNode(subscriptionNode).downloading = Synchronizer.isExecuting(item.url);
+ let data = Templater.getDataForNode(subscriptionNode);
+ data.downloading = Synchronizer.isExecuting(item.url);
+ data.upgradeRequired = ListManager.isUpgradeRequired(item);
Templater.update(this._template, subscriptionNode);
if (!document.commandDispatcher.focusedElement)
@@ -324,4 +327,19 @@ ListManager.allowAcceptableAds = function(/**Boolean*/ allow)
FilterStorage.removeSubscription(subscription);
};
+/**
+ * Checks whether Adblock Plus needs to be upgraded in order to support filters
+ * in a particular subscription.
+ */
+ListManager.isUpgradeRequired = function(/**Subscription*/ subscription)
+{
+ if (subscription instanceof DownloadableSubscription && subscription.requiredVersion)
+ {
+ let {addonVersion} = require("info");
+ if (Services.vc.compare(subscription.requiredVersion, addonVersion) > 0)
+ return true;
+ }
+ return false;
+};
+
window.addEventListener("load", ListManager.init, false);
diff --git a/chrome/content/ui/filters.js b/chrome/content/ui/filters.js
index 399b504..63a333f 100644
--- a/chrome/content/ui/filters.js
+++ b/chrome/content/ui/filters.js
@@ -117,6 +117,7 @@ var Templater =
for (let key in data)
sandbox[key] = data[key];
sandbox.formatTime = Utils.formatTime;
+ sandbox.getSubscriptionTitle = getSubscriptionTitle;
// Clone template but remove id/hidden attributes from it
let result = template.cloneNode(true);
diff --git a/chrome/content/ui/filters.xul b/chrome/content/ui/filters.xul
index e3c6f5a..a083634 100644
--- a/chrome/content/ui/filters.xul
+++ b/chrome/content/ui/filters.xul
@@ -187,7 +187,7 @@
<hbox align="center">
<deck class="titleBox" flex="1" selectedIndex="0" onselect="event.stopPropagation();">
<description ondblclick="if (event.button == 0) TitleEditor.start(this, true);">
- <description class="title" value="{subscription.title}" flex="1" crop="end"/>
+ <description class="title" value="{getSubscriptionTitle(subscription)}" flex="1" crop="end"/>
(<if condition="{isExternal}">
<description value="&subscription.external.label;"/>
<else/>
@@ -246,7 +246,7 @@
</button>
</hbox>
- <description class="warning" hidden="{!subscription.upgradeRequired}">&subscription.minVersion.warning;</description>
+ <description class="warning" hidden="{!upgradeRequired}">&subscription.minVersion.warning;</description>
<description class="warning" hidden="{!disabledFilters}">
&subscription.disabledFilters.warning;
<description class="link" value="&subscription.disabledFilters.enable;" onclick="SubscriptionActions.enableFilters(this);"/>
@@ -287,7 +287,7 @@
checked="{subscription.disabled ? 'false' : 'true'}" oncommand="SubscriptionActions.setDisabled(this, !this.checked);"/>
<hbox align="center" flex="1">
<deck class="titleBox" flex="1" selectedIndex="0" onselect="event.stopPropagation();">
- <description class="title" value="{subscription.title}" crop="end" ondblclick="if (event.button == 0) TitleEditor.start(this, true);"/>
+ <description class="title" value="{getSubscriptionTitle(subscription)}" crop="end" ondblclick="if (event.button == 0) TitleEditor.start(this, true);"/>
<textbox oncontextmenu="event.stopPropagation();" class="titleEditor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true);"/>
</deck>
</hbox>
diff --git a/chrome/content/ui/sendReport.js b/chrome/content/ui/sendReport.js
index aa4b07b..89aa61f 100644
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -757,7 +757,7 @@ var subscriptionUpdateDataSource =
entry.removeAttribute("hidden");
entry.setAttribute("_url", subscription.url);
entry.setAttribute("tooltiptext", subscription.url);
- entry.textContent = subscription.title;
+ entry.textContent = getSubscriptionTitle(subscription);
list.appendChild(entry);
}
}
@@ -996,8 +996,8 @@ var issuesDataSource =
let element = template.cloneNode(true);
element.removeAttribute("id");
element.removeAttribute("hidden");
- element.firstChild.setAttribute("value", subscription.title);
- element.setAttribute("tooltiptext", subscription instanceof DownloadableSubscription ? subscription.url : subscription.title);
+ element.firstChild.setAttribute("value", getSubscriptionTitle(subscription));
+ element.setAttribute("tooltiptext", subscription instanceof DownloadableSubscription ? subscription.url : getSubscriptionTitle(subscription));
element.abpSubscription = subscription;
disabledSubscriptionsBox.appendChild(element);
}
diff --git a/chrome/content/ui/sidebar.js b/chrome/content/ui/sidebar.js
index c158007..fcb2c96 100644
--- a/chrome/content/ui/sidebar.js
+++ b/chrome/content/ui/sidebar.js
@@ -330,7 +330,7 @@ function fillInTooltip(e) {
while (sourceElement.firstChild)
sourceElement.removeChild(sourceElement.firstChild);
for (let i = 0; i < subscriptions.length; i++)
- setMultilineContent(sourceElement, subscriptions[i].title, true);
+ setMultilineContent(sourceElement, getSubscriptionTitle(subscriptions[i]), true);
}
}
@@ -785,8 +785,8 @@ function compareFilterSource(item1, item2)
{
let filter1 = getFilter(item1);
let filter2 = getFilter(item2);
- let subs1 = filter1 ? filter1.subscriptions.map(s => s.title).join(", ") : "";
- let subs2 = filter2 ? filter2.subscriptions.map(s => s.title).join(", ") : "";
+ let subs1 = filter1 ? filter1.subscriptions.map(s => getSubscriptionTitle(s)).join(", ") : "";
+ let subs2 = filter2 ? filter2.subscriptions.map(s => getSubscriptionTitle(s)).join(", ") : "";
if (subs1 < subs2)
return -1;
else if (subs1 > subs2)
@@ -925,7 +925,7 @@ var treeView = {
if (!filter)
return "";
- return filter.subscriptions.filter(s => !s.disabled).map(s => s.title).join(", ");
+ return filter.subscriptions.filter(s => !s.disabled).map(s => getSubscriptionTitle(s)).join(", ");
}
else
return this.data[row].location;
diff --git a/chrome/content/ui/utils.js b/chrome/content/ui/utils.js
index ca86874..f367d75 100644
--- a/chrome/content/ui/utils.js
+++ b/chrome/content/ui/utils.js
@@ -57,6 +57,25 @@ function E(id)
}
/**
+ * Determines subscription's title as it should be displayed in the UI.
+ * @return {String}
+ * subscription's title or an appropriate default title if none present
+ */
+function getSubscriptionTitle(/**Subscription*/ subscription)
+{
+ if (subscription.title)
+ return subscription.title;
+
+ if (subscription instanceof DownloadableSubscription)
+ return subscription.url;
+
+ if (subscription instanceof SpecialSubscription && subscription.defaults)
+ return Utils.getString(subscription.defaults + "Group_title");
+
+ return Utils.getString("newGroup_title");
+}
+
+/**
* Split up all labels into the label and access key portions.
*/
document.addEventListener("DOMContentLoaded", function splitAllLabelsHandler()
diff --git a/dependencies b/dependencies
index 865e6ab..48c2425 100644
--- a/dependencies
+++ b/dependencies
@@ -1,5 +1,5 @@
_root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
_self = buildtools/ensure_dependencies.py
buildtools = buildtools hg:c92cc4e4a338 git:c20bb8c
-adblockpluscore = adblockpluscore hg:4d43739579c2 git:2ef1723
+adblockpluscore = adblockpluscore hg:2d4888611240 git:ed0acc5
adblockplusui = adblockplusui hg:eaf7a04285fa git:d6484f7
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list