dont fail if selected annotation is not present

This commit is contained in:
j 2012-02-21 17:00:35 +05:30
parent db6f68681a
commit 01d975878b

View file

@ -215,10 +215,11 @@ Ox.AnnotationPanel = function(options, self) {
function renderEditMenu() { function renderEditMenu() {
var annotation, annotationTitle, folder, var annotation, annotationTitle, folder,
isDefined, isEditable, isEvent, isEventOrPlace, isPlace, isString, isDefined, isEditable, isEvent, isEventOrPlace, isPlace, isString,
key, manageTitle, type, value key, manageTitle, type, value;
if (self.options.selected) { if (self.options.selected) {
annotation = getAnnotation(self.options.selected); annotation = getAnnotation(self.options.selected);
folder = getFolder(self.options.selected); folder = getFolder(self.options.selected);
if(annotation && folder) {
key = folder.options('id'); key = folder.options('id');
type = folder.options('type'); type = folder.options('type');
value = annotation.value; value = annotation.value;
@ -231,6 +232,7 @@ Ox.AnnotationPanel = function(options, self) {
isDefined = isEventOrPlace && !!annotation[type] && !!annotation[type].type; isDefined = isEventOrPlace && !!annotation[type] && !!annotation[type].type;
annotationTitle = folder.options('item') + ': "' + value + '"'; annotationTitle = folder.options('item') + ': "' + value + '"';
} }
}
manageTitle = (isDefined ? 'Edit' : 'Define') + ' ' manageTitle = (isDefined ? 'Edit' : 'Define') + ' '
+ (isPlace ? 'Place' : isEvent ? 'Event' : 'Place or Event') + '...' + (isPlace ? 'Place' : isEvent ? 'Event' : 'Place or Event') + '...'
self.$editMenuButton && self.$editMenuButton.remove(); self.$editMenuButton && self.$editMenuButton.remove();