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

Don't add 'Web Page" to new item menu by accident

Browse source 
And ignore it if it's there
This commit is contained in:
Dan Stillman 2012-02-20 03:31:22 -05:00
parent 3c500b8ebf
commit 0d34e34a3a
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/data/cachedTypes.js
View file

@ -273,7 +273,7 @@ Zotero.ItemTypes = new function() {
mru = mru.split(',').slice(0, limit); mru = mru.split(',').slice(0, limit);
for (var i=0, len=mru.length; i<len; i++) { for (var i=0, len=mru.length; i<len; i++) {
var id = parseInt(mru[i]); var id = parseInt(mru[i]);
if (!isNaN(id)) { if (!isNaN(id) && id != 13) { // ignore 'webpage' item type
params.push(id); params.push(id);
} }
} }

32
chrome/content/zotero/zoteroPane.js
View file

@ -276,7 +276,7 @@ var ZoteroPane = new function()
menuitem.setAttribute("label", itemTypes[i].localized); menuitem.setAttribute("label", itemTypes[i].localized);
menuitem.setAttribute("tooltiptext", ""); menuitem.setAttribute("tooltiptext", "");
let type = itemTypes[i].id; let type = itemTypes[i].id;
menuitem.addEventListener("command", function() { ZoteroPane_Local.newItem(type); }, false); menuitem.addEventListener("command", function() { ZoteroPane_Local.newItem(type, {}, null, true); }, false);
moreMenu.appendChild(menuitem); moreMenu.appendChild(menuitem);
} }
} }
@ -314,7 +314,7 @@ var ZoteroPane = new function()
menuitem.setAttribute("label", itemTypes[i].localized); menuitem.setAttribute("label", itemTypes[i].localized);
menuitem.setAttribute("tooltiptext", ""); menuitem.setAttribute("tooltiptext", "");
let type = itemTypes[i].id; let type = itemTypes[i].id;
menuitem.addEventListener("command", function() { ZoteroPane_Local.newItem(type); }, false); menuitem.addEventListener("command", function() { ZoteroPane_Local.newItem(type, {}, null, true); }, false);
menuitem.className = "zotero-tb-add"; menuitem.className = "zotero-tb-add";
addMenu.insertBefore(menuitem, separator); addMenu.insertBefore(menuitem, separator);
} }
@ -665,7 +665,7 @@ var ZoteroPane = new function()
* *
* _data_ is an optional object with field:value for itemData * _data_ is an optional object with field:value for itemData
*/ */
function newItem(typeID, data, row) function newItem(typeID, data, row, manual)
{ {
if (!Zotero.stateCheck()) { if (!Zotero.stateCheck()) {
this.displayErrorMessage(true); this.displayErrorMessage(true);
@ -682,7 +682,7 @@ var ZoteroPane = new function()
} }
} }
if (row !== undefined) { if (row !== undefined && row !== null) {
var itemGroup = this.collectionsView._getItemAtRow(row); var itemGroup = this.collectionsView._getItemAtRow(row);
var libraryID = itemGroup.ref.libraryID; var libraryID = itemGroup.ref.libraryID;
} }
@ -710,19 +710,21 @@ var ZoteroPane = new function()
document.getElementById('zotero-view-item').selectedIndex = 0; document.getElementById('zotero-view-item').selectedIndex = 0;
// Update most-recently-used list for New Item menu // Update most-recently-used list for New Item menu
var mru = Zotero.Prefs.get('newItemTypeMRU'); if (manual) {
if (mru) { var mru = Zotero.Prefs.get('newItemTypeMRU');
var mru = mru.split(','); if (mru) {
var pos = mru.indexOf(typeID + ''); var mru = mru.split(',');
if (pos != -1) { var pos = mru.indexOf(typeID + '');
mru.splice(pos, 1); if (pos != -1) {
mru.splice(pos, 1);
}
mru.unshift(typeID);
} }
mru.unshift(typeID); else {
var mru = [typeID + ''];
}
Zotero.Prefs.set('newItemTypeMRU', mru.slice(0, 5).join(','));
} }
else {
var mru = [typeID + ''];
}
Zotero.Prefs.set('newItemTypeMRU', mru.slice(0, 5).join(','));
return Zotero.Items.get(itemID); return Zotero.Items.get(itemID);
} }