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

Fix installing styles from the preferences

Browse Source
This commit is contained in:
Simon Kornblith 2013-03-28 16:55:14 -04:00
parent 1b6a69f656
commit 7ce93e66d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chrome/content/zotero/xpcom/style.js
View File

@ -184,11 +184,11 @@ Zotero.Styles = new function() {
* displayed in dialogs referencing the style
*/
this.install = function(style, origin) {
var styleFile = null, styleInstalled;
var styleInstalled;
if(style instanceof Components.interfaces.nsIFile) {
// handle nsIFiles
origin = style.leafName;
styleInstalled = Zotero.File.getContentsAsync(styleFile).when(function(style) {
styleInstalled = Zotero.File.getContentsAsync(style).when(function(style) {
return _install(style, origin);
});
} else {
@ -197,8 +197,8 @@ Zotero.Styles = new function() {
styleInstalled.fail(function(error) {
// Unless user cancelled, show an alert with the error
if(error instanceof Zotero.Exception.UserCancelled) return;
if(error instanceof Zotero.Exception.Alert) {
if(typeof error === "object" && error instanceof Zotero.Exception.UserCancelled) return;
if(typeof error === "object" && error instanceof Zotero.Exception.Alert) {
error.present();
error.log();
} else {
@ -220,14 +220,14 @@ Zotero.Styles = new function() {
function _install(style, origin, hidden) {
if(!_initialized || !_cacheTranslatorData) Zotero.Styles.init();
var existingFile, destFile, source;
var existingFile, destFile, source, styleID
return Q.fcall(function() {
// First, parse style and make sure it's valid XML
var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
.createInstance(Components.interfaces.nsIDOMParser),
doc = parser.parseFromString(style, "application/xml");
var styleID = Zotero.Utilities.xpathText(doc, '/csl:style/csl:info[1]/csl:id[1]',
styleID = Zotero.Utilities.xpathText(doc, '/csl:style/csl:info[1]/csl:id[1]',
Zotero.Styles.ns),
// Get file name from URL
m = /[^\/]+$/.exec(styleID),
@ -346,7 +346,7 @@ Zotero.Styles = new function() {
return Zotero.HTTP.promise("GET", source).then(function(xmlhttp) {
return _install(xmlhttp.responseText, origin, true);
}).fail(function(error) {
if(error instanceof Zotero.Exception) {
if(typeof error === "object" && error instanceof Zotero.Exception) {
throw new Zotero.Exception.Alert("styles.installSourceError", [origin, source],
"styles.install.title", error);
} else {
@ -376,7 +376,7 @@ Zotero.Styles = new function() {
var enumerator = wm.getEnumerator("zotero:pref");
while(enumerator.hasMoreElements()) {
var win = enumerator.getNext();
win.refreshStylesList(styleID);
win.Zotero_Preferences.Cite.refreshStylesList(styleID);
}
});
}