[Pkg-mozext-commits] [compactheader] 231/441: Make the AMO upload check happier (replace onclick attribute by event listener)
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository compactheader.
commit 678e0d18dd9469e042a1f40c9e2a8c90c9efaca1
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date: Sat Jul 23 21:57:38 2011 +0200
Make the AMO upload check happier (replace onclick attribute by event listener)
---
chrome/CompactHeader/content/RSSLinkify.js | 41 ++++++++++++++--------
.../CompactHeader/content/compactHeaderOverlay.js | 36 ++-----------------
chrome/CompactHeader/content/toolbar.js | 30 ++++++++++++++++
defaults/preferences/prefs.js | 1 -
install.rdf | 6 ++--
5 files changed, 63 insertions(+), 51 deletions(-)
diff --git a/chrome/CompactHeader/content/RSSLinkify.js b/chrome/CompactHeader/content/RSSLinkify.js
index 8b9ec2d..ab00b1b 100644
--- a/chrome/CompactHeader/content/RSSLinkify.js
+++ b/chrome/CompactHeader/content/RSSLinkify.js
@@ -55,12 +55,12 @@ org.mozdev.compactHeader.RSSLinkify = function() {
.getBranch("extensions.CompactHeader.");
var coheIntegrateRSSLinkify = false;
-
+
var RSSLinkify = {
oldSubject: null,
newSubject: null
};
-
+
pub.UpdateHeaderView = function(currentHeaderData) {
org.mozdev.compactHeader.debug.log("updateheaderview start");
if (!currentHeaderData) {
@@ -70,17 +70,20 @@ org.mozdev.compactHeader.RSSLinkify = function() {
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
var url = currentHeaderData["content-base"];
if(url) {
- RSSLinkify.newSubject.setAttribute("onclick", "if (!event.button) messenger.launchExternalURL('" +
- url.headerValue + "');");
- RSSLinkify.newSubject.setAttribute("value", currentHeaderData["subject"].headerValue);
- RSSLinkify.newSubject.setAttribute("url", url.headerValue);
- RSSLinkify.newSubject.setAttribute("collapsed", "false");
- RSSLinkify.oldSubject.setAttribute("collapsed", "true");
- RSSLinkify.newSubject.setAttribute("tooltiptext", url.headerValue);
+// RSSLinkify.newSubject.setAttribute("onclick", "if (!event.button) messenger.launchExternalURL('" +
+// url.headerValue + "');");
+ RSSLinkify.newSubject.setAttribute("value", currentHeaderData["subject"].headerValue);
+ RSSLinkify.newSubject.setAttribute("url", url.headerValue);
+ RSSLinkify.newSubject.setAttribute("collapsed", "false");
+ RSSLinkify.oldSubject.setAttribute("collapsed", "true");
+ RSSLinkify.newSubject.setAttribute("tooltiptext", url.headerValue);
+ RSSLinkify.newSubject.addEventListener("click",
+ org.mozdev.compactHeader.RSSLinkify.openBrowser, false);
} else {
- RSSLinkify.newSubject.setAttribute("collapsed", "true");
- RSSLinkify.oldSubject.setAttribute("collapsed", "false");
- RSSLinkify.oldSubject.setAttribute("tooltiptext", currentHeaderData["subject"].headerValue);
+ removeEventListener('click', openBrowser, true);
+ RSSLinkify.newSubject.setAttribute("collapsed", "true");
+ RSSLinkify.oldSubject.setAttribute("collapsed", "false");
+ RSSLinkify.oldSubject.setAttribute("tooltiptext", currentHeaderData["subject"].headerValue);
// if (gCoheCollapsedHeaderViewMode) {
// //linkifySubject('collapsed1LsubjectBox');
// }
@@ -100,6 +103,15 @@ org.mozdev.compactHeader.RSSLinkify = function() {
org.mozdev.compactHeader.debug.log("updateheaderview stop");
};
+ pub.openBrowser = function(event) {
+ org.mozdev.compactHeader.debug.log("open browser 0" + event.attrName);
+ if (!event.button) {
+ url = RSSLinkify.newSubject.getAttribute("url");
+ org.mozdev.compactHeader.debug.log("open browser 2" + url);
+ messenger.launchExternalURL(url);
+ }
+ };
+
pub.InitializeHeaderViewTables = function() {
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start");
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
@@ -145,7 +157,8 @@ org.mozdev.compactHeader.RSSLinkify = function() {
link.appendChild(document.createTextNode(matches[1]));
link.setAttribute("href", matches[1]);
link.setAttribute("class","text-link");
- link.setAttribute("onclick", "org.mozdev.compactHeader.pane.subjectLinkOnClickListenter(event);");
+ link.addEventListener("onclick",
+ pub.subjectLinkOnClickListenter, false);
return [pre,link,post];
}
/* loop through multiple possible links in the subject */
@@ -179,7 +192,7 @@ org.mozdev.compactHeader.RSSLinkify = function() {
if (websiteAddressNode)
{
var websiteAddress = websiteAddressNode.getAttribute("url");
-
+
var contractid = "@mozilla.org/widget/clipboardhelper;1";
var iid = Components.interfaces.nsIClipboardHelper;
var clipboard = Components.classes[contractid].getService(iid);
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 4683b27..c490cfc 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -204,18 +204,18 @@ org.mozdev.compactHeader.pane = function() {
var headerViewToolbox = document.getElementById("header-view-toolbox");
if (headerViewToolbox) {
headerViewToolbox.addEventListener("DOMAttrModified",
- onDoCustomizationHeaderViewToolbox, false);
+ org.mozdev.compactHeader.toolbar.onDoCustomizationHeaderViewToolbox, false);
}
var mailToolbox = document.getElementById("mail-toolbox");
if (mailToolbox) {
mailToolbox.addEventListener("DOMAttrModified",
- onDoCustomizationHeaderViewToolbox, false);
+ org.mozdev.compactHeader.toolbar.onDoCustomizationHeaderViewToolbox, false);
}
var dispMUAicon = document.getElementById("dispMUAicon");
if (dispMUAicon) {
dispMUAicon.addEventListener("DOMAttrModified",
- org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
+ org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
}
// work around XUL deck bug where collapsed header view, if it's the persisted
@@ -329,36 +329,6 @@ org.mozdev.compactHeader.pane = function() {
});
}
- onDoCustomizationHeaderViewToolbox = function(event) {
- if (event.attrName == "doCustomization") {
- org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox start");
- org.mozdev.compactHeader.toolbar.dispMUACheck(document);
- org.mozdev.compactHeader.buttons.coheToggleStar();
- var dispMUAicon = document.getElementById("dispMUAicon");
- if (dispMUAicon) {
- var evt1 = document.createEvent("MutationEvents");
- evt1.initMutationEvent("DOMAttrModified",
- true, false, dispMUAicon,
- dispMUAicon.getAttribute("src"),
- dispMUAicon.getAttribute("src"),
- "src",
- evt1.MODIFICATION
- );
- dispMUAicon.dispatchEvent(evt1);
- var evt2 = document.createEvent("MutationEvents");
- evt2.initMutationEvent("DOMAttrModified",
- true, false, dispMUAicon,
- dispMUAicon.getAttribute("tooltiptext"),
- dispMUAicon.getAttribute("tooltiptext"),
- "tooltiptext",
- evt2.MODIFICATION
- );
- dispMUAicon.dispatchEvent(evt2);
- }
- org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox done");
- }
- };
-
// make sure the appropriate fields within the currently displayed view header mode
// are collapsed or visible...
function coheUpdateHeaderView()
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 3cd77f2..6e7f167 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -361,6 +361,36 @@ org.mozdev.compactHeader.toolbar = function() {
// org.mozdev.compactHeader.buttons.coheToggleStar();
// }
// }
+ pub.onDoCustomizationHeaderViewToolbox = function(event) {
+ if (event.attrName == "doCustomization") {
+ org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox start" + event);
+ org.mozdev.compactHeader.toolbar.dispMUACheck(document);
+ org.mozdev.compactHeader.buttons.coheToggleStar();
+ var dispMUAicon = document.getElementById("dispMUAicon");
+ if (dispMUAicon) {
+ var evt1 = document.createEvent("MutationEvents");
+ evt1.initMutationEvent("DOMAttrModified",
+ true, false, dispMUAicon,
+ dispMUAicon.getAttribute("src"),
+ dispMUAicon.getAttribute("src"),
+ "src",
+ evt1.MODIFICATION
+ );
+ dispMUAicon.dispatchEvent(evt1);
+ var evt2 = document.createEvent("MutationEvents");
+ evt2.initMutationEvent("DOMAttrModified",
+ true, false, dispMUAicon,
+ dispMUAicon.getAttribute("tooltiptext"),
+ dispMUAicon.getAttribute("tooltiptext"),
+ "tooltiptext",
+ evt2.MODIFICATION
+ );
+ dispMUAicon.dispatchEvent(evt2);
+ }
+ org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox done");
+ }
+ };
+
removeButtonDispMUA = function() {
org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index aeb8f6b..2d9327d 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -3,6 +3,5 @@ pref("extensions.CompactHeader.headersize.linkify", false);
pref("extensions.CompactHeader.headersize.addressstyle", false);
pref("extensions.CompactHeader.headersize.flatButtons", false);
-pref("extensions.CompactHeader.version", 3);
pref("extensions.CompactHeader.version", "0");
pref("extensions.CompactHeader.firstrun", true);
diff --git a/install.rdf b/install.rdf
index 8509b69..1daf67f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<RDF:Description about="urn:mozilla:install-manifest">
<em:name>CompactHeader</em:name>
- <em:version>1.4.2beta2</em:version>
+ <em:version>1.4.2beta3</em:version>
<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
<em:creator>Joachim Herb</em:creator>
<em:contributor>Zamula</em:contributor>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git
More information about the Pkg-mozext-commits
mailing list