Skip to content
This repository has been archived by the owner on Oct 16, 2020. It is now read-only.

Commit

Permalink
* revert a7516e partly:
Browse files Browse the repository at this point in the history 
  * support icedove/iceweasel/iceape (appId's are equivalent with FF, TB, SM)
  * have a nice "F" mandatory wrapper object (instead of the long "firetray")
* fix version anchor on the firetray splash page when opening a tab
  • Loading branch information
foudfou committed Mar 30, 2012
1 parent 746ab75 commit f5e56da
Show file tree
Hide file tree
Showing 13 changed files with 222 additions and 211 deletions.
4 changes: 2 additions & 2 deletions src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ $(build_dir)/$(chrome_source_root)/%.js: $(chrome_source_root)/%.js
cp -f $< $@; \
else \
echo "Stripping debug calls from JS file $<"; \
sed '/firetray.LOG(/d' $< > $@; \
sed '/F.LOG(/d' $< > $@; \
fi

$(build_dir)/$(modules_dir)/%: $(modules_dir)/%
Expand All @@ -147,7 +147,7 @@ $(build_dir)/$(modules_dir)/%: $(modules_dir)/%
cp -f $< $@; \
else \
echo "Stripping debug calls from module $<"; \
sed '/firetray.LOG(/d' $< > $@; \
sed '/F.LOG(/d' $< > $@; \
fi

$(build_dir):
Expand Down
40 changes: 20 additions & 20 deletions src/chrome/content/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ var firetrayUIOptions = {
updateWindowAndIconOptions: function() {
let hides_on_close = document.getElementById("ui_hides_on_close").checked;
let hides_on_minimize = document.getElementById("ui_hides_on_minimize").checked;
firetray.LOG("hides_on_close="+hides_on_close+", hides_on_minimize="+hides_on_minimize);
F.LOG("hides_on_close="+hides_on_close+", hides_on_minimize="+hides_on_minimize);
document.getElementById('ui_hides_single_window').disabled =
!(hides_on_close || hides_on_minimize);
},
Expand Down Expand Up @@ -129,7 +129,7 @@ var firetrayUIOptions = {
},

updateNotificationSettings: function() {
firetray.LOG("updateNotificationSettings");
F.LOG("updateNotificationSettings");
let radioMailNotify = document.getElementById("ui_radiogroup_mail_notification");
let mailNotificationType = +radioMailNotify.getItemAtIndex(radioMailNotify.selectedIndex).value;
firetray.Utils.prefService.setIntPref("mail_notification_type", mailNotificationType);
Expand All @@ -155,7 +155,7 @@ var firetrayUIOptions = {
},

disableMessageCountMaybe: function(msgCountType) {
firetray.LOG("disableMessageCountMaybe: "+msgCountType);
F.LOG("disableMessageCountMaybe: "+msgCountType);
let msgCountTypeIsNewMessages = (msgCountType === FIRETRAY_MESSAGE_COUNT_TYPE_NEW);

let notificationUnreadCount = document.getElementById("ui_mail_notification_unread_count");
Expand Down Expand Up @@ -219,7 +219,7 @@ var firetrayUIOptions = {
let localizedFolderType = this.strings.getString(folderType);
let item = excludedFoldersList.appendItem(localizedFolderType, folderType);
item.setAttribute("observes", "broadcaster-notification-disabled");
firetray.LOG("folder: "+folderType);
F.LOG("folder: "+folderType);
if (!(FLDRS_UNINTERESTING[folderType] & prefExcludedFoldersFlags))
excludedFoldersList.addItemToSelection(item); // doesn't trigger onselect
}
Expand All @@ -228,7 +228,7 @@ var firetrayUIOptions = {
updateExcludedFoldersPref: function() {
let excludedFoldersList = document.getElementById('excluded_folders_list');

firetray.LOG("LAST SELECTED: "+excludedFoldersList.currentItem.label);
F.LOG("LAST SELECTED: "+excludedFoldersList.currentItem.label);
let excludedFoldersFlags = null;
for (let i = 0, len=excludedFoldersList.itemCount; i<len; ++i) {
let folder = excludedFoldersList.getItemAtIndex(i);
Expand All @@ -237,7 +237,7 @@ var firetrayUIOptions = {
else
excludedFoldersFlags |= FLDRS_UNINTERESTING[folder.value];
}
firetray.LOG("excluded folders flags: "+excludedFoldersFlags);
F.LOG("excluded folders flags: "+excludedFoldersFlags);

firetray.Utils.prefService.setIntPref("excluded_folders_flags",
excludedFoldersFlags);
Expand All @@ -252,9 +252,9 @@ var firetrayUIOptions = {
let that = this;
try {
let cells = row.childNodes; // .getElementsByTagName('treecell');
firetray.LOG("CELLS: "+cells);
F.LOG("CELLS: "+cells);
for (let i=0, len=cells.length; i<len; ++i) {
firetray.LOG("i: "+i+", cell:"+cells[i]);
F.LOG("i: "+i+", cell:"+cells[i]);
if (disable === true) {
cells[i].setAttribute('properties', "disabled");
if (i === TREEROW_ACCOUNT_OR_SERVER_TYPE_EXCLUDED) {
Expand All @@ -272,16 +272,16 @@ var firetrayUIOptions = {
}
}
} catch(e) {
firetray.ERROR(e);
F.ERROR(e);
}
},

/**
* needed for triggering actual preference change and saving
*/
_userChangeValueTree: function(event) {
if (event.attrName == "label") firetray.LOG("label changed!");
if (event.attrName == "value") firetray.LOG("value changed!");
if (event.attrName == "label") F.LOG("label changed!");
if (event.attrName == "value") F.LOG("value changed!");
document.getElementById("pane1")
.userChangedValue(document.getElementById("ui_tree_mail_accounts"));

Expand All @@ -296,14 +296,14 @@ var firetrayUIOptions = {
let subRows = firetray.Utils.XPath(
checkboxCell,
'ancestor::xul:treeitem[1]/descendant::xul:treechildren//xul:treerow');
firetray.LOG("subRows="+subRows);
F.LOG("subRows="+subRows);
for (let i=0, len=subRows.length; i<len; ++i) {
firetrayUIOptions._disableTreeRow(
subRows[i], (checkboxCell.getAttribute("value") === "false"));
}

} else if (event.attrName == "label") { // text
firetray.WARN("NOT IMPLEMENTED YET: move row to new rank"); // TODO
F.WARN("NOT IMPLEMENTED YET: move row to new rank"); // TODO
}

this._userChangeValueTree(event);
Expand All @@ -322,7 +322,7 @@ var firetrayUIOptions = {
let serverTypes = mailAccounts["serverTypes"];
let accountsExcluded = mailAccounts["excludedAccounts"];
let accountsByServerType = firetray.Messaging.accountsByServerType();
firetray.LOG(JSON.stringify(accountsByServerType));
F.LOG(JSON.stringify(accountsByServerType));

// sort serverTypes according to order
let serverTypesSorted = Object.keys(serverTypes);
Expand All @@ -335,7 +335,7 @@ var firetrayUIOptions = {
return 1;
return 0; // no sorting
});
firetray.LOG("serverTypesSorted: "+serverTypesSorted);
F.LOG("serverTypesSorted: "+serverTypesSorted);

let target = document.getElementById("ui_mail_accounts");
for (let i=0, len=serverTypesSorted.length; i<len; ++i) {
Expand Down Expand Up @@ -373,7 +373,7 @@ var firetrayUIOptions = {
// add actual accounts as children
let subChildren = document.createElement('treechildren');
let typeAccounts = accountsByServerType[serverTypeName];
firetray.LOG("type: "+serverTypeName+", Accounts: "+JSON.stringify(typeAccounts));
F.LOG("type: "+serverTypeName+", Accounts: "+JSON.stringify(typeAccounts));
if (typeof(typeAccounts) == "undefined")
continue;

Expand Down Expand Up @@ -432,7 +432,7 @@ var firetrayUIOptions = {
saveTreeAccountsOrServerTypes: function() {
let tree = document.getElementById("ui_tree_mail_accounts");

firetray.LOG("VIEW="+ tree.view + ", rowCount="+tree.view.rowCount);
F.LOG("VIEW="+ tree.view + ", rowCount="+tree.view.rowCount);
let prefObj = {"serverTypes":{}, "excludedAccounts":[]};
for (let i=0, len=tree.view.rowCount; i<len; ++i) {
let accountOrServerTypeName = tree.view.getCellText(
Expand All @@ -444,7 +444,7 @@ var firetrayUIOptions = {
let accountOrServerTypeOrder = parseInt(
tree.view.getCellText(
i, tree.columns.getNamedColumn("account_or_server_type_order")));
firetray.LOG("account: "+accountOrServerTypeName+", "+accountOrServerTypeExcluded);
F.LOG("account: "+accountOrServerTypeName+", "+accountOrServerTypeExcluded);

if (tree.view.getLevel(i) === TREELEVEL_SERVER_TYPES) {
prefObj["serverTypes"][accountOrServerTypeName] =
Expand All @@ -464,14 +464,14 @@ var firetrayUIOptions = {
}

let prefStr = JSON.stringify(prefObj);
firetray.LOG("prefStr"+prefStr);
F.LOG("prefStr"+prefStr);

/* return the new prefString to be stored by pref system */
return prefStr;
},

onKeyPressTreeAccountsOrServerTypes: function(event) {
firetray.LOG("TREE KEYPRESS: "+event.originalTarget);
F.LOG("TREE KEYPRESS: "+event.originalTarget);
let tree = document.getElementById("ui_tree_mail_accounts");
let col = tree.editingColumn; // col.index

Expand Down
14 changes: 7 additions & 7 deletions src/chrome/content/overlay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
onLoad: function(win) {
this.strings = document.getElementById("firetray-strings"); // chrome-specific

firetray.LOG("Handler initialized: "+firetray.Handler.initialized);
F.LOG("Handler initialized: "+firetray.Handler.initialized);
let init = firetray.Handler.initialized || firetray.Handler.init();

firetray.LOG("ONLOAD"); firetray.Handler.dumpWindows();
F.LOG("ONLOAD"); firetray.Handler.dumpWindows();
let winId = firetray.Handler.registerWindow(win);

if (firetray.Handler.inMailApp && firetray.Messaging.initialized)
Expand All @@ -25,11 +25,11 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
win.addEventListener('close', firetrayChrome.onClose, true);

if (firetray.Handler.windows[winId].startHidden) {
firetray.LOG('start_hidden');
F.LOG('start_hidden');
firetray.Handler.hideSingleWindow(winId);
}

firetray.LOG('Firetray LOADED: ' + init);
F.LOG('Firetray LOADED: ' + init);
return true;
},

Expand All @@ -39,7 +39,7 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
/* NOTE: don't do firetray.Handler.initialized=false here, otherwise after
a window close, a new window will create a new handler (and hence, a new
tray icon) */
firetray.LOG('Firetray UNLOADED !');
F.LOG('Firetray UNLOADED !');
},

/* until we find a fix (TODO), we need to set browser.tabs.warnOnClose=false
Expand All @@ -48,14 +48,14 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
use trying to set warnOnClose=false temporarily in onClose, since onClose is
called *after* the popup */
onClose: function(event) {
firetray.LOG('Firetray CLOSE');
F.LOG('Firetray CLOSE');
let win = event.originalTarget;
if (!win instanceof ChromeWindow)
throw new TypeError('originalTarget not a ChromeWindow');

let hides_on_close = firetray.Utils.prefService.getBoolPref('hides_on_close');
let hides_single_window = firetray.Utils.prefService.getBoolPref('hides_single_window');
firetray.LOG('hides_on_close: '+hides_on_close+', hides_single_window='+hides_single_window);
F.LOG('hides_on_close: '+hides_on_close+', hides_single_window='+hides_single_window);
if (hides_on_close) {
if (hides_single_window) {
let winId = firetray.Handler.getWindowIdFromChromeWindow(win);
Expand Down
Loading

0 comments on commit f5e56da

Please sign in to comment.