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

Commons:

Browse source 
- Check getDisplayTitle() in pre-upload title check
- Use display title for ZIP filename, and run through getValidFileName()
- Use display title in URI
This commit is contained in:
Dan Stillman 2010-09-10 02:32:02 +00:00
parent b7db38d946
commit f5d383a91e
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chrome/content/zotero/xpcom/commons.js
View file

@ -771,7 +771,7 @@ Zotero.Commons.Bucket.prototype.uploadItems = function (ids) {
for (var i=0, len=items.length; i<len; i++) { for (var i=0, len=items.length; i<len; i++) {
if (items[i].isRegularItem()) { if (items[i].isRegularItem()) {
// Item must have a title // Item must have a title
if (!items[i].getField('title')) { if (!items[i].getDisplayTitle()) {
continue; continue;
} }
@ -858,7 +858,7 @@ Zotero.Commons.Bucket.prototype.uploadItems = function (ids) {
// TODO: localize // TODO: localize
progressWin.changeHeadline("Uploading Items to IA"); progressWin.changeHeadline("Uploading Items to IA");
progressWin.addLines([item.getField('title')], [item.getImageSrc()]); progressWin.addLines([item.getDisplayTitle()], [item.getImageSrc()]);
progressWin.show(); progressWin.show();
self.uploadItem( self.uploadItem(
@ -909,7 +909,8 @@ Zotero.Commons.Bucket.prototype.uploadItem = function (item, callback) {
// Then create ZIP file from item // Then create ZIP file from item
var zipFile = Zotero.getTempDirectory(); var zipFile = Zotero.getTempDirectory();
zipFile.append(item.getField('title') + '-' + key + '.zip'); var title = Zotero.File.getValidFileName(item.getDisplayTitle());
zipFile.append(title + '-' + key + '.zip');
var zw = Components.classes["@mozilla.org/zipwriter;1"] var zw = Components.classes["@mozilla.org/zipwriter;1"]
.createInstance(Components.interfaces.nsIZipWriter); .createInstance(Components.interfaces.nsIZipWriter);
@ -1150,7 +1151,8 @@ Zotero.Commons.Bucket.prototype.putFile = function (file, mimeType, callback) {
Zotero.Commons.Bucket.prototype.getItemURI = function (item) { Zotero.Commons.Bucket.prototype.getItemURI = function (item) {
return this.uri + '#' + encodeURIComponent(item.getField('title')); // TODO: this won't work for non-English systems
return this.uri + '#' + encodeURIComponent(item.getDisplayTitle());
} }