[Pkg-mozext-commits] [compactheader] 422/441: Try to fix more Javascript strict problems
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:24 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 569ac226240fb068f5f1199c7ae18a7e7471dc23
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date: Sat Dec 13 15:50:41 2014 +0100
Try to fix more Javascript strict problems
--HG--
branch : 36.0a1
---
chrome.manifest | 7 +-
chrome/CompactHeader/content/CHTMessenger.js | 2 +-
chrome/CompactHeader/content/RSSLinkify.js | 4 +-
chrome/CompactHeader/content/buttonsOverlay.js | 6 +-
.../content/compactHeaderOverlay-9.xul | 251 ---------------------
.../CompactHeader/content/compactHeaderOverlay.js | 55 ++++-
chrome/CompactHeader/content/debug.js | 7 +-
chrome/CompactHeader/content/toolbar.js | 40 ++--
8 files changed, 87 insertions(+), 285 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index 2444cce..72ca8b1 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -23,11 +23,12 @@ locale CompactHeader zh-CN chrome/CompactHeader/locale/zh-CN/
locale CompactHeader nl chrome/CompactHeader/locale/nl/
locale CompactHeader sl-SI chrome/CompactHeader/locale/sl-SI/
-overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay-9.xul appversion<24.0a2
+overlay chrome://messenger/content/messageWindow.xul chrome://CompactHeader/content/CHTMessenger.xul
+overlay chrome://messenger/content/messenger.xul chrome://CompactHeader/content/CHTMessenger.xul
+
overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay-36.xul appversion>=36.0a1
overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay-10.xul appversion>=10.0a1
overlay chrome://global/content/customizeToolbar.xul chrome://CompactHeader/content/customizeToolbarOverlay.xul
-overlay chrome://CompactHeader/content/preferences.xul chrome://CompactHeader/content/preferences-old.xul appversion<10.0a2
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader-os/skin/osdef.css
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader/skin/CompactHeader.css
@@ -36,5 +37,3 @@ overlay chrome://messenger/content/messageWindow.xul chrome://CompactHeader/
overlay chrome://messenger/content/messenger.xul chrome://CompactHeader/content/buttonsOverlay.xul
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader-os/skin/buttonsOverlay.css
-overlay chrome://messenger/content/messageWindow.xul chrome://CompactHeader/content/CHTMessenger.xul
-overlay chrome://messenger/content/messenger.xul chrome://CompactHeader/content/CHTMessenger.xul
diff --git a/chrome/CompactHeader/content/CHTMessenger.js b/chrome/CompactHeader/content/CHTMessenger.js
index 385630a..9aa50f4 100644
--- a/chrome/CompactHeader/content/CHTMessenger.js
+++ b/chrome/CompactHeader/content/CHTMessenger.js
@@ -38,7 +38,7 @@
# ***** END LICENSE BLOCK *****
*/
-if(!org) var org={};
+if(org === "undefined" || !org) var org = {};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.customizeHeaderToolbar) org.mozdev.customizeHeaderToolbar = {};
diff --git a/chrome/CompactHeader/content/RSSLinkify.js b/chrome/CompactHeader/content/RSSLinkify.js
index 3c6c99c..6fdd18c 100644
--- a/chrome/CompactHeader/content/RSSLinkify.js
+++ b/chrome/CompactHeader/content/RSSLinkify.js
@@ -40,7 +40,7 @@
//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
-if(!org) var org={};
+if(org === "undefined" || !org) var org = {};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
@@ -150,7 +150,7 @@ org.mozdev.compactHeader.RSSLinkify = function() {
if (regex.links.test(subject)) {
var text = subject;
/* utility function to split text and links */
- function linkify(text) {
+ linkify = function(text) {
var matches = regex.links.exec(text);
var pre, post = null;
[pre, post] = text.split(matches[1]);
diff --git a/chrome/CompactHeader/content/buttonsOverlay.js b/chrome/CompactHeader/content/buttonsOverlay.js
index d8038b2..28f5131 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.js
+++ b/chrome/CompactHeader/content/buttonsOverlay.js
@@ -38,8 +38,8 @@
# ***** END LICENSE BLOCK *****
*/
-if(!org) var org={};
-if(!org.mozdev) org.mozdev={};
+if(org === "undefined" || !org) var org = {};
+if(!org.mozdev) org.mozdev = {};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
org.mozdev.compactHeader.buttons = function() {
@@ -51,6 +51,7 @@ org.mozdev.compactHeader.buttons = function() {
.getService(Components.interfaces.nsIMsgMailSession);
var nsIFolderListener = Components.interfaces.nsIFolderListener;
mailSession.AddFolderListener(folderListener, nsIFolderListener.propertyFlagChanged);
+ window.addEventListener("load", function(e) { pub.singlemessage_controller.onLoad(e); }, false);
}
pub.coheToggleStar = function () {
@@ -113,4 +114,3 @@ org.mozdev.compactHeader.buttons = function() {
}();
org.mozdev.compactHeader.buttons.init();
-window.addEventListener("load", function(e) { org.mozdev.compactHeader.buttons.singlemessage_controller.onLoad(e); }, false);
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
deleted file mode 100644
index ad8da30..0000000
--- a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" ?>
-
-<!DOCTYPE overlay [
- <!ENTITY % utilityDTD SYSTEM
- "chrome://communicator/locale/utilityOverlay.dtd">
- %utilityDTD; <!-- copyCmd -->
- <!ENTITY % msgHeaderDTD SYSTEM
- "chrome://messenger/locale/msgHdrViewOverlay.dtd">
- %msgHeaderDTD;
- <!ENTITY % compactHeaderDTD SYSTEM
- "chrome://CompactHeader/locale/CompactHeader.dtd">
- %compactHeaderDTD;
- <!ENTITY % preferencesDTD SYSTEM
- "chrome://CompactHeader/locale/preferences.dtd">
- %preferencesDTD;
- <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
- %messengerDTD;
-]>
-
-<?xml-stylesheet href="chrome://CompactHeader/skin/CompactHeader.css" type="text/css"?>
-<?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
-
-
-<overlay id="compactHeaderOverlay"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script type="application/javascript" src="chrome://CompactHeader/content/debug.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/RSSLinkify.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/toolbar.js"/>
- <script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
-
- <keyset>
- <key id="CompactHeader_hideDetailsKey"
- modifiers="shift"
- key="&CompactHeader_toggleDetails.key;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
- </keyset>
-
- <menupopup id="header-toolbar-context-menu">
- <menuitem id="CompactHeader_hidecohePreferencesButton"
- label="&CompactHeader_dialog.title;"
- oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
- </menupopup>
-
- <deck id="msgHeaderViewDeck">
-
- <vbox id="expandedHeaderView" orient="horizontal">
- <vbox id="CompactHeader_hideDetailsButtonBox" insertbefore="expandedHeadersBox">
- <button id="CompactHeader_hideDetailsButton"
- tooltiptext="&CompactHeader_hideDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
- class="msgHeaderView-flat-button"/>
- </vbox>
-
- <hbox id="CompactHeader_coheStringTransferBox" hidden="true">
- <label id="CompactHeader_CoheHideDetailsLabel" value="&CompactHeader_hideDetailsButton.label;"/>
- <label id="CompactHeader_CoheShowDetailsLabel" value="&CompactHeader_showDetailsButton.label;"/>
- </hbox>
-
- <vbox id="expandedHeadersBox">
- <html:div xmlns:html="http://www.w3.org/1999/xhtml" id="expandedHeadersTopBox" flex="1">
- <!-- <hbox id="expandedHeadersTopBox" flex="1"> -->
- <toolbox id="header-view-toolbox"
- mode="icons"
- minwidth="10px"
- defaultmode="icons">
- <toolbarpalette id="header-view-toolbar-palette">
- <toolbarbutton id="CompactHeader_hdrOtherActionsButton"
- label="&otherActionsButton1.label;"
- tooltiptext="&otherActionsButton1.label;"
- class="toolbarbutton-1 msgHeaderView-button hdrOtherActionsButton"
- type="menu"/>
- </toolbarpalette>
- <toolbar id="header-view-toolbar"
- mode="icons" defaultmode="icons"
- defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,CompactHeader_hdrOtherActionsButton">
- </toolbar>
- </toolbox>
- <!-- </hbox> -->
- </html:div>
-
-
- <hbox id="expandedHeadersBottomBox">
-
- <vbox id="otherActionsBox" flex="0">
- <hbox id="dateValueBox" flex="0"/>
- <button type="menu" id="otherActionsButton" collapsed="true"
- label="&otherActionsButton1.label;"
- class="msgHeaderView-button msgHeaderView-flat-button">
- <menupopup id="otherActionsPopup" onpopupshowing="org.mozdev.compactHeader.toolbar.showOtherActionButtonMenu();">
- <menuitem id="CompactHeader_hdrPane-markFlagged"
- type="checkbox"
- label="&markStarredCmd.label;"
- accesskey="&markStarredCmd.accesskey;"
- command="cmd_markAsFlagged"
- insertbefore="viewSourceMenuItem"
- key="key_toggleFlagged"/>
- <menu id="CompactHeader_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
- <menupopup id="CompactHeader_menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
- <menuitem id="CompactHeader_hdrPane-viewallheaders"
- type="radio"
- name="viewheadergroup"
- label="&headersAllCmd.label;"
- accesskey="&headersAllCmd.accesskey;"
- command="cmd_viewAllHeader"/>
- <menuitem id="CompactHeader_hdrPane-viewnormalheaders"
- type="radio"
- name="viewheadergroup"
- label="&headersNormalCmd.label;"
- accesskey="&headersNormalCmd.accesskey;"
- command="cmd_viewNormalHeader"/>
- </menupopup>
- </menu>
- <menuseparator id="CompactHeader_otherActionPopupAfterViewSource"/>
- <menuitem id="CompactHeader_hideDetailsMenu"
- label="&CompactHeader_hideDetailsButton.label;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
- key="CompactHeader_hideDetailsKey"/>
- <menuitem id="CompactHeader_hidecohePreferencesButton"
- label="&CompactHeader_dialog.title;"
- oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
- </menupopup>
- </button>
- </vbox>
- </hbox>
-
- </vbox>
-
- <vbox id="CompactHeader_dispMUAexp" collapsed="false">
- <image id="CompactHeader_dispMUAiconExp" observes="dispMUAbroadcast" tooltiptext=""
- style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
- onclick="dispMUA.infopopup();"/>
- </vbox>
-
- </vbox>
-
- <vbox id="CompactHeader_collapsedHeaderView" orient="horizontal" flex="1">
- <menupopup id="CompactHeader_copyPopup" popupanchor="bottomleft">
- <menuitem id="CompactHeader_copyPopup_CopyLink"
- label="©LinkCmd.label;" accesskey="©LinkCmd.accesskey;"
- oncommand="org.mozdev.compactHeader.RSSLinkify.CopyToClipboard(document.popupNode, 'url')"/>
- <menuitem id="CompactHeader_copyPopup_CopyText"
- label="©Cmd.label;" accesskey="©Cmd.accesskey;"
- oncommand="org.mozdev.compactHeader.RSSLinkify.CopyToClipboard(document.popupNode, 'value')"/>
- </menupopup>
- <vbox id="CompactHeader_showDetailsButtonBox" align="start" flex="0">
- <button id="CompactHeader_showDetailsButton"
- tooltiptext="&CompactHeader_showDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
- class="msgHeaderView-flat-button"/>
- </vbox>
- <vbox id="CompactHeader_collapsed1LHeadersBox" flex="1" collapsed="false">
- <hbox id="CompactHeader_collapsed1LHeaderViewFirstLine" flex="0">
- <hbox id="CompactHeader_collapsed1LsubjectOutBox" align="start" flex="99">
- <row id="CompactHeader_collapsed1LsubjectRow" flex="99">
- <mail-headerfield id="CompactHeader_collapsed1LsubjectBox" flex="99"/>
- </row>
- </hbox>
- <hbox id="CompactHeader_collapsed1LfromOutBox" align="start" flex="0">
- <grid flex="1">
- <columns>
- <column flex="0"/>
- </columns>
- <rows>
- <row id="CompactHeader_collapsed1LfromRow">
- <mail-multi-emailHeaderField id="CompactHeader_collapsed1LfromBox" flex="0"/>
- </row>
- </rows>
- </grid>
- </hbox>
- <hbox id="CompactHeader_collapsed1LdateOutBox" align="start" pack="end" flex="0">
- <row id="CompactHeader_collapsed1LdateRow">
- <label id="CompactHeader_collapsed1LdateBox" class="dateLabel" flex="1"/>
- </row>
- </hbox>
- <header-view-button-box id="CompactHeader_collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
- </hbox>
- <hbox id="CompactHeader_collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
- </hbox>
- </vbox>
-
- <vbox id="CompactHeader_collapsed2LHeadersBox" flex="1" collapsed="true">
- <hbox id="CompactHeader_collapsed2LHeaderViewFirstLine" flex="0">
- <hbox id="CompactHeader_collapsed2LfromOutBox" align="start" flex="0">
- <grid flex="1">
- <columns>
- <column flex="0"/>
- </columns>
- <rows>
- <row id="CompactHeader_collapsed2LfromRow">
- <mail-multi-emailHeaderField id="CompactHeader_collapsed2LfromBox" flex="0"/>
- </row>
- </rows>
- </grid>
- </hbox>
- <grid id="CompactHeader_collapsed2LtoCcBccOutBox" flex="1">
- <columns>
- <column flex="0"/>
- <column flex="1"/>
- </columns>
- <rows>
- <row id="CompactHeader_collapsed2LtoCcBccRow" align="baseline">
- <label id="CompactHeader_collapsed2LtoCcBccLabel" class="headerName"
- value="&toField3.label;" control="CompactHeader_collapsed2LtoCcBccBox"/>
- <mail-multi-emailHeaderField id="CompactHeader_collapsed2LtoCcBccBox" flex="1"/>
- </row>
- </rows>
- </grid>
- <header-view-button-box id="CompactHeader_collapsed2LButtonBox" flex="0" align="start"/>
- </hbox>
- <hbox id="CompactHeader_collapsed2LHeaderViewSecondLine" align="top" flex="1">
- <hbox id="CompactHeader_collapsed2LsubjectOutBox" align="top" flex="99">
- <row id="CompactHeader_collapsed2LsubjectRow" flex="99">
- <mail-headerfield id="CompactHeader_collapsed2LsubjectBox" flex="99"/>
- </row>
- </hbox>
- <hbox id="CompactHeader_collapsed2LdateOutBox" align="top" pack="end" flex="0">
- <row id="CompactHeader_collapsed2LdateRow" align="top" pack="end">
- <label id="CompactHeader_collapsed2LdateBox" class="dateLabel" flex="1"/>
- </row>
- </hbox>
- </hbox>
-
-
-
- </vbox>
-
- <vbox id="CompactHeader_dispMUA2line">
- <image id="CompactHeader_dispMUAicon2line" observes="dispMUAbroadcast"
- tooltiptext=""
- style="width:32px; height:32px; margin-left:2px; margin-right:2px;"
- onclick="dispMUA.infopopup();"/>
- </vbox>
-
- <vbox id="CompactHeader_dispMUAcompact">
- <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAbroadcast"
- tooltiptext=""
- style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
- onclick="dispMUA.infopopup();"/>
- </vbox>
-
-
- </vbox>
-
- </deck>
-
-</overlay>
-
-<!--
--->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index bdc0166..fb08684 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -51,10 +51,50 @@
// view in the message header pane.
////////////////////////////////////////////////////////////////////////////////////
-if(!org) var org={};
+if(org === "undefined" || !org) var org = {};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
+org.mozdev.compactHeader.debug = function() {
+ var pub = {};
+
+ var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefService)
+ .getBranch("extensions.CompactHeader.");
+ var aConsoleService = Components.classes["@mozilla.org/consoleservice;1"]
+ .getService(Components.interfaces.nsIConsoleService);
+ const { console } = Components.utils.import("resource://gre/modules/devtools/Console.jsm", {});
+
+ pub.LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
+ var gCurrentLogLevel = pub.LOGLEVEL.info; // TODO: Set to info
+
+ pub.log = function(str, logLevel) {
+ logLevel = typeof logLevel !== 'undefined' ? logLevel : pub.LOGLEVEL.debug;
+ if (logLevel >= gCurrentLogLevel) {
+ aConsoleService.logStringMessage(Date() + " CH: " + str);
+ Application.console.log(Date() + " CH: " + str);
+// console.log(Date() + " CH: " + str);
+ }
+ };
+
+ pub.setLogLevel = function(logLevel) {
+ gCurrentLogLevel = logLevel;
+ cohePrefBranch.setIntPref("debugLevel", debugLevel);
+ };
+
+ pub.getLogLevel = function() {
+ try{
+ gCurrentLogLevel = cohePrefBranch.getIntPref("debugLevel");
+ } catch(e) {
+ } finally {
+ }
+ pub.log("Current logLevel: " + gCurrentLogLevel, pub.LOGLEVEL.error)
+ return gCurrentLogLevel;
+ };
+
+ return pub;
+}();
+
//Components.utils.import("chrome://CompactHeader/content/RSSLinkify.jsm");
//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
//Components.utils.import("chrome://CompactHeader/content/toolbar.jsm");
@@ -295,7 +335,7 @@ org.mozdev.compactHeader.pane = function() {
let collapsed2LtoCcBccBox = document.getElementById("CompactHeader_collapsed2LtoCcBccBox");
if (collapsed2LtoCcBccBox) {
let updateEmailAddressNodeFunction = collapsed2LtoCcBccBox.updateEmailAddressNode;
- function updateEmailAddressNodeNew(aEmailNode, aAddress) {
+ collapsed2LtoCcBccBox.updateEmailAddressNode = function(aEmailNode, aAddress) {
try {
updateEmailAddressNodeFunction(aEmailNode, aAddress);
}
@@ -304,8 +344,7 @@ org.mozdev.compactHeader.pane = function() {
" from updateEmailAddressNode");
}
aEmailNode.setAttribute("addressType", aAddress.addressType);
- }
- collapsed2LtoCcBccBox.updateEmailAddressNode = updateEmailAddressNodeNew;
+ };
if (typeof collapsed2LtoCcBccBox.setNMoreTooltiptext == 'function') {
// remove setNMoreTooltiptext because we have our own function
collapsed2LtoCcBccBox.setNMoreTooltiptext = function() {
@@ -364,9 +403,9 @@ org.mozdev.compactHeader.pane = function() {
.getService(Components.interfaces.nsIAbManager)
.removeAddressBookListener(coheAddressBookListener);
- removeEventListener('messagepane-loaded',
+ removeEventListener('messagepane-loaded',
org.mozdev.compactHeader.pane.coheOnLoadMsgHeaderPane, true);
- removeEventListener('messagepane-unloaded',
+ removeEventListener('messagepane-unloaded',
org.mozdev.compactHeader.pane.coheOnUnloadMsgHeaderPane, true);
}
@@ -525,10 +564,10 @@ org.mozdev.compactHeader.pane = function() {
if (document.getElementById("CompactHeader_hideDetailsMenu")) {
document.getElementById("CompactHeader_hideDetailsMenu").setAttribute("label", strLabel);
}
-
+
document.getElementById("CompactHeader_viewMenuCompactBroadcast")
.setAttribute("checked", gCoheCollapsedHeaderViewMode);
-
+
org.mozdev.compactHeader.debug.log("coheToggleHeaderContent stop");
}
diff --git a/chrome/CompactHeader/content/debug.js b/chrome/CompactHeader/content/debug.js
index f049f04..1b56b22 100644
--- a/chrome/CompactHeader/content/debug.js
+++ b/chrome/CompactHeader/content/debug.js
@@ -38,7 +38,7 @@
# ***** END LICENSE BLOCK *****
*/
-if(!org) var org={};
+if(org === "undefined" || !org) var org = {};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
@@ -50,14 +50,17 @@ org.mozdev.compactHeader.debug = function() {
.getBranch("extensions.CompactHeader.");
var aConsoleService = Components.classes["@mozilla.org/consoleservice;1"]
.getService(Components.interfaces.nsIConsoleService);
+ const { console } = Components.utils.import("resource://gre/modules/devtools/Console.jsm", {});
pub.LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
var gCurrentLogLevel = pub.LOGLEVEL.info; // TODO: Set to info
pub.log = function(str, logLevel) {
- if (!logLevel) var logLevel = pub.LOGLEVEL.debug;
+ logLevel = typeof logLevel !== 'undefined' ? logLevel : pub.LOGLEVEL.debug;
if (logLevel >= gCurrentLogLevel) {
aConsoleService.logStringMessage(Date() + " CH: " + str);
+ Application.console.log(Date() + " CH: " + str);
+// console.log(Date() + " CH: " + str);
}
};
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index c4b1140..b5731f5 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -40,7 +40,7 @@
//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
-if(!org) var org={};
+if(org === "undefined" || !org) var org = {};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
@@ -84,7 +84,7 @@ org.mozdev.compactHeader.toolbar = function() {
if (pub.cannotMoveToolbox()) {
targetPos = "top";
}
- for (i=0; i<gToolboxes.length; i++) {
+ for (let i = 0; i < gToolboxes.length; i++) {
if ((targetPos == gToolboxes[i].pos) &&
((gToolboxes[i].header == null) || (targetHeader == gToolboxes[i].header))
) {
@@ -321,35 +321,43 @@ org.mozdev.compactHeader.toolbar = function() {
var IconContainerDispMUA = null;
if (dispMUAButton) {
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp");
+ if (IconContainerDispMUA) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")
+ if (IconContainerDispMUA) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")
+ if (IconContainerDispMUA) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
else if (dispMUABox){
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp")
+ if (IconContainerDispMUA) {
IconContainerDispMUA.removeAttribute("collapsed");
}
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line"))
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")
+ if (IconContainerDispMUA)
IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact"))
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")
+ if (IconContainerDispMUA)
IconContainerDispMUA.setAttribute("collapsed", "true");
}
else {
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact"))
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")
+ if (IconContainerDispMUA)
IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line"))
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")
+ if (IconContainerDispMUA)
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
@@ -357,15 +365,18 @@ org.mozdev.compactHeader.toolbar = function() {
else {
var IconContainerDispMUA = null;
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp")
+ if (IconContainerDispMUA) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")
+ if (IconContainerDispMUA) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")
+ if (IconContainerDispMUA) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
@@ -380,7 +391,8 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon: " + imageSrc);
var IconContainerDispMUA = null;
/* toolbar button */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_button-dispMUA")) {
+ IconContainerDispMUA = document.getElementById("CompactHeader_button-dispMUA")
+ if (IconContainerDispMUA) {
IconContainerDispMUA.setAttribute("image", imageSrc);
}
}
--
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