wassname/Mostly-Harmless
1
0
Fork 0
mirror of https://github.com/wassname/Mostly-Harmless.git synced 2026-08-17 11:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

addListener for handleManualClick only once. Fixes #7

Browse Source
This commit is contained in:
Kerrick Long
2011-07-20 19:21:25 -05:00
parent 14db446145
commit 788406a078
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/common.js
+30 -20
View File
@@ -198,6 +198,17 @@ function BrowserAction() {
return true;
}
/**
* Handle a manual click on the browser action button. It will be called if there is no popup.
* @alias BrowserAction.handleManualClick(tab)
* @param {Object} tab The Google Chrome tab object.
* @return {Boolean} Returns true.
* @method
*/
BrowserAction.prototype.handleManualClick = function (tab) {
background.prepareBrowserAction(tab.id, null, tab, true);
};
/**
* Set the browser icon badge to its defaults.
* @alias BrowserAction.setBadgeDefaults(tabId)
@@ -211,9 +222,7 @@ BrowserAction.prototype.setBadgeDefaults = function (tabId) {
chrome.browserAction.setTitle({'title': 'Click to load data.', 'tabId': tabId});
chrome.browserAction.setBadgeBackgroundColor({'color': [192, 192, 192, 255], 'tabId': tabId});
chrome.browserAction.setPopup({popup: '', tabId: tabId});
chrome.browserAction.onClicked.addListener(function (tab) {
reddit.getInfo(tab.url, tab.id);
});
chrome.browserAction.onClicked.addListener(this.handleManualClick);
return true;
};
@@ -229,9 +238,6 @@ BrowserAction.prototype.setBadgeIgnore = function (tabId) {
chrome.browserAction.setBadgeText({'text': '', 'tabId': tabId});
chrome.browserAction.setTitle({'title': chrome.i18n.getMessage('not_activated'), 'tabId': tabId});
chrome.browserAction.setPopup({popup: '', tabId: tabId});
chrome.browserAction.onClicked.addListener(function (tab) {
reddit.getInfo(tab.url, tab.id);
});
return true;
};
@@ -264,9 +270,6 @@ BrowserAction.prototype.setBadgeError = function (tabId, text) {
chrome.browserAction.setTitle({'title': text, 'tabId': tabId});
chrome.browserAction.setBadgeBackgroundColor({'color': [200, 0, 0, 255], 'tabId': tabId});
chrome.browserAction.setPopup({popup: '', tabId: tabId});
chrome.browserAction.onClicked.addListener(function (tab) {
reddit.getInfo(tab.url, tab.id);
});
return true;
};
@@ -813,11 +816,26 @@ function Background() {
* @param {Number} tabId The ID of the tab to get data for.
* @param {Object} info The info for the change as sent by Chrome.
* @param {Object} tab The info for the tab as sent by Chrome.
* @param {Boolean} force Optional: If true, this bypasses any checks.
* @return {Boolean} Returns true.
* @method
*/
Background.prototype.prepareBrowserAction = function (tabId, info, tab) {
if (info.status === 'loading') {
Background.prototype.prepareBrowserAction = function (tabId, info, tab, force) {
function setBadge() {
if (cache.get(tab.url) === undefined || cache.get(tab.url).cacheDate - utils.epoch() < -60 * settings.get('cacheTime')) {
console.log(chrome.i18n.getMessage('loading_api'));
reddit.getInfo(tab.url, tabId);
} else {
console.log(chrome.i18n.getMessage('loading_cache'));
button.setBadgeFor(tab.url, tabId);
}
return true;
}
if (force === true) {
setBadge();
} else if (info.status === 'loading') {
try {
var excludedRegex, match;
@@ -836,13 +854,7 @@ Background.prototype.prepareBrowserAction = function (tabId, info, tab) {
}
if (settings.get('waitForClick') === false && match === false) {
if (cache.get(tab.url) === undefined || cache.get(tab.url).cacheDate - utils.epoch() < -60 * settings.get('cacheTime')) {
console.log(chrome.i18n.getMessage('loading_api'));
reddit.getInfo(tab.url, tabId);
} else {
console.log(chrome.i18n.getMessage('loading_cache'));
button.setBadgeFor(tab.url, tabId);
}
setBadge();
} else {
button.setBadgeIgnore(tabId);
}
@@ -850,8 +862,6 @@ Background.prototype.prepareBrowserAction = function (tabId, info, tab) {
button.setBadgeError(tabId, error.message);
}
}
return true;
};
/**