dont fail if selected annotation is not present
This commit is contained in:
parent
db6f68681a
commit
01d975878b
1 changed files with 14 additions and 12 deletions
|
@ -215,21 +215,23 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
function renderEditMenu() {
|
||||
var annotation, annotationTitle, folder,
|
||||
isDefined, isEditable, isEvent, isEventOrPlace, isPlace, isString,
|
||||
key, manageTitle, type, value
|
||||
key, manageTitle, type, value;
|
||||
if (self.options.selected) {
|
||||
annotation = getAnnotation(self.options.selected);
|
||||
folder = getFolder(self.options.selected);
|
||||
key = folder.options('id');
|
||||
type = folder.options('type');
|
||||
value = annotation.value;
|
||||
isEditable = annotation.editable;
|
||||
isEvent = type == 'event';
|
||||
isPlace = type == 'place';
|
||||
isEventOrPlace = isEvent || isPlace;
|
||||
isString = type != 'text';
|
||||
// fixme: absence of annotation[type] may be an error
|
||||
isDefined = isEventOrPlace && !!annotation[type] && !!annotation[type].type;
|
||||
annotationTitle = folder.options('item') + ': "' + value + '"';
|
||||
if(annotation && folder) {
|
||||
key = folder.options('id');
|
||||
type = folder.options('type');
|
||||
value = annotation.value;
|
||||
isEditable = annotation.editable;
|
||||
isEvent = type == 'event';
|
||||
isPlace = type == 'place';
|
||||
isEventOrPlace = isEvent || isPlace;
|
||||
isString = type != 'text';
|
||||
// fixme: absence of annotation[type] may be an error
|
||||
isDefined = isEventOrPlace && !!annotation[type] && !!annotation[type].type;
|
||||
annotationTitle = folder.options('item') + ': "' + value + '"';
|
||||
}
|
||||
}
|
||||
manageTitle = (isDefined ? 'Edit' : 'Define') + ' '
|
||||
+ (isPlace ? 'Place' : isEvent ? 'Event' : 'Place or Event') + '...'
|
||||
|
|
Loading…
Reference in a new issue