suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set label on Report Errors... menu option properly

Browse Source
This commit is contained in:
Simon Kornblith 2011-01-14 07:48:42 +00:00
parent 9da1a2b9e0
commit 697e840d4e
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
chrome/content/zotero/overlay.xul
View File

@ -470,15 +470,26 @@
<script> <script>
<![CDATA[ <![CDATA[
window.addEventListener('load', function(e){ window.addEventListener('load', function(e){
// Set label for "Report Errors..."
if(Zotero && Zotero.initialized) {
// Set "Report Errors..." label via property rather than DTD entity,
// since we need to reference it in script elsewhere
document.getElementById('zotero-tb-actions-reportErrors').setAttribute('label',
Zotero.getString('errorReport.reportErrors'));
}
// Check whether standalone is running, and return if so
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
var isStandalone = appInfo.ID === "zotero@chnm.gmu.edu";
if(isStandalone) return;
// THE FOLLOWING CODE IS NOT APPLIED IN STANDALONE
// (It relates almost entirely to the Zotero icon)
var iconPref = Components.classes["@mozilla.org/preferences-service;1"] var iconPref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService) .getService(Components.interfaces.nsIPrefService)
.getBranch('extensions.zotero.').getIntPref('statusBarIcon'); .getBranch('extensions.zotero.').getIntPref('statusBarIcon');
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
// no need to add to any status bars in standalone
var isStandalone = appInfo.ID === "zotero@chnm.gmu.edu";
if(isStandalone) return;
var isFx36 = appInfo.platformVersion.indexOf('1.9') === 0; var isFx36 = appInfo.platformVersion.indexOf('1.9') === 0;
// Status bar in Fx3.6 // Status bar in Fx3.6
@ -511,11 +522,6 @@
icon.setAttribute('compact', true); icon.setAttribute('compact', true);
break; break;
} }
// Set "Report Errors..." label via property rather than DTD entity,
// since we need to reference it in script elsewhere
document.getElementById('zotero-tb-actions-reportErrors').setAttribute('label',
Zotero.getString('errorReport.reportErrors'));
} }
else { else {
if (Zotero) { if (Zotero) {
@ -536,11 +542,9 @@
var errMsg = stringBundle.GetStringFromName('startupError'); var errMsg = stringBundle.GetStringFromName('startupError');
} }
if(icon) { icon.setAttribute('tooltiptext', errMsg);
icon.setAttribute('tooltiptext', errMsg); icon.setAttribute('error', 'true');
icon.setAttribute('error', 'true'); icon.setAttribute('hidden', false);
icon.setAttribute('hidden', false);
}
} }
// Used for loading pages from upgrade wizard // Used for loading pages from upgrade wizard