mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '4.0' into api_syncing

Browse source 
Conflicts:
	chrome/content/zotero/lookup.js
This commit is contained in:
Dan Stillman 2015-04-15 00:56:25 -04:00
commit 384a547693
3 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
chrome/content/zotero/lookup.js
View file

@ -87,10 +87,11 @@ const Zotero_Lookup = new function () {
} }
if(!items.length) { if(!items.length) {
var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] Zotero.alert(
.getService(Components.interfaces.nsIPromptService); window,
prompts.alert(window, Zotero.getString("lookup.failure.title"), Zotero.getString("lookup.failure.title"),
Zotero.getString("lookup.failureToID.description")); Zotero.getString("lookup.failureToID.description")
);
return false; return false;
} }
@ -127,10 +128,11 @@ const Zotero_Lookup = new function () {
if(successful) { if(successful) {
document.getElementById("zotero-lookup-panel").hidePopup(); document.getElementById("zotero-lookup-panel").hidePopup();
} else { } else {
var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] Zotero.alert(
.getService(Components.interfaces.nsIPromptService); window,
prompts.alert(window, Zotero.getString("lookup.failure.title"), Zotero.getString("lookup.failure.title"),
Zotero.getString("lookup.failure.description")); Zotero.getString("lookup.failure.description")
);
} }
} }
}); });

23
chrome/content/zotero/xpcom/zotero.js
View file

@ -1260,6 +1260,29 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
err.lineNumber ? err.lineNumber : null, null); err.lineNumber ? err.lineNumber : null, null);
} }
/**
* Display an alert in a given window
*
* This is just a wrapper around nsIPromptService.alert() that takes the Zotero.noUserInput
* flag into consideration
*
* @param {Window}
* @param {String} title
* @param {String} msg
*/
this.alert = function (window, title, msg) {
if (this.noUserInput) {
Zotero.debug("Not displaying alert: " + title + ": " + msg);
return;
}
var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService);
ps.alert(window, title, msg);
}
function getErrors(asStrings) { function getErrors(asStrings) {
var errors = []; var errors = [];

1
test/runtests.sh
View file

@ -76,6 +76,7 @@ mkdir "$PROFILE/zotero"
cat <<EOF > "$PROFILE/prefs.js" cat <<EOF > "$PROFILE/prefs.js"
user_pref("extensions.autoDisableScopes", 0); user_pref("extensions.autoDisableScopes", 0);
user_pref("extensions.zotero.debug.log", $DEBUG); user_pref("extensions.zotero.debug.log", $DEBUG);
user_pref("extensions.zotero.debug.time", $DEBUG);
user_pref("extensions.zotero.firstRunGuidance", false); user_pref("extensions.zotero.firstRunGuidance", false);
user_pref("extensions.zotero.firstRun2", false); user_pref("extensions.zotero.firstRun2", false);
EOF EOF