remove abstracted data layer calls

This commit is contained in:
Simon Kornblith 2010-11-05 03:10:56 +00:00
parent 925bc7ca5b
commit 3c28e25eab

View file

@ -513,14 +513,10 @@ Zotero.Utilities = {
* @type Boolean * @type Boolean
*/ */
"itemTypeExists":function(type) { "itemTypeExists":function(type) {
if(Zotero.isConnector) { if(Zotero.ItemTypes.getID(type)) {
return !!Zotero.Connector.Data.itemTypes[type]; return true;
} else { } else {
if(Zotero.ItemTypes.getID(type)) { return false;
return true;
} else {
return false;
}
} }
}, },
@ -531,16 +527,12 @@ Zotero.Utilities = {
* @return {String[]} Creator types * @return {String[]} Creator types
*/ */
"getCreatorsForType":function(type) { "getCreatorsForType":function(type) {
if(Zotero.isConnector) { var types = Zotero.CreatorTypes.getTypesForItemType(Zotero.ItemTypes.getID(type));
return Zotero.Connector.Data.itemTypes[type].creatorTypes.slice(0); var cleanTypes = new Array();
} else { for(var i=0; i<types.length; i++) {
var types = Zotero.CreatorTypes.getTypesForItemType(Zotero.ItemTypes.getID(type)); cleanTypes.push(types[i].name);
var cleanTypes = new Array();
for(var i=0; i<types.length; i++) {
cleanTypes.push(types[i].name);
}
return cleanTypes;
} }
return cleanTypes;
}, },
/** /**
@ -550,11 +542,7 @@ Zotero.Utilities = {
* @return {String[]} Creator types * @return {String[]} Creator types
*/ */
"fieldIsValidForType":function(field, type) { "fieldIsValidForType":function(field, type) {
if(Zotero.isConnector) { return Zotero.ItemFields.isValidForType(field, Zotero.ItemTypes.getID(type));
return Zotero.Connector.Data.itemTypes[type].fields.slice(0);
} else {
return Zotero.ItemFields.isValidForType(field, Zotero.ItemTypes.getID(type));
}
}, },
/** /**
@ -565,14 +553,10 @@ Zotero.Utilities = {
* @type Boolean * @type Boolean
*/ */
"getLocalizedCreatorType":function(type) { "getLocalizedCreatorType":function(type) {
if(Zotero.isConnector) { try {
return Zotero.Connector.Data.creatorTypes[type].localizedString; return Zotero.CreatorTypes.getLocalizedString(type);
} else { } catch(e) {
try { return false;
return Zotero.getString("creatorTypes."+type);
} catch(e) {
return false;
}
} }
} }
} }