From b4b66f9bd552f2b1da8e870a4cdbcbc637bfe5a6 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 16 Feb 2019 13:28:18 +0530 Subject: [PATCH] remove annotations and other annotation menu options --- static/js/annotationPanel.js | 32 ++++++++++++++++------- static/js/removeAnnotations.js | 48 ++++++++++++++++++++++++++++++++++ static/js/viewer.js | 18 ++++++++++++- static/json/js.json | 1 + 4 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 static/js/removeAnnotations.js diff --git a/static/js/annotationPanel.js b/static/js/annotationPanel.js index c189abc..f0cf0e5 100644 --- a/static/js/annotationPanel.js +++ b/static/js/annotationPanel.js @@ -1,6 +1,7 @@ 'use strict'; -oml.ui.annotationPanel = function() { +oml.ui.annotationPanel = function(options, self) { + self = self || {}; var ui = oml.user.ui; var ui = oml.user.ui; @@ -29,14 +30,15 @@ oml.ui.annotationPanel = function() { click: function() { var $annotation = oml.$ui.annotationFolder.find('.OMLAnnotation.selected') $annotation.length && $annotation.delete() - $deleteQuote.options({disabled: true}) + that.updateSelection() } }).appendTo($bar); var $menuButton = Ox.MenuButton({ items: [ - {id: 'addAnnotation', title: 'Add Annotation', disabled: true}, - {id: 'removeAnnotation', title: 'Remove Annotation', disabled: true}, + {id: 'addAnnotation', title: 'Add Annotation', disabled: true, keyboard: 'return'}, + {id: 'removeAnnotation', title: 'Remove Annotation', disabled: true, keyboard: 'delete'}, + {id: 'removeAnnotations', title: 'Remove All Annotation', disabled: true}, {}, {id: 'show', title: Ox._('Show Annotations'), disabled: true}, {group: 'showAnnotationUsers', min: 1, max: 1, items: [ @@ -82,6 +84,14 @@ oml.ui.annotationPanel = function() { }, function(result) { oml.ui.exportAnnotationsDialog(result.data).open() }) + } else if (id =='addAnnotation') { + oml.$ui.viewer.postMessage('addAnnotation', {}) + } else if (id =='removeAnnotation') { + var $annotation = oml.$ui.annotationFolder.find('.OMLAnnotation.selected') + $annotation.length && $annotation.delete() + that.updateSelection() + } else if (id =='removeAnnotations') { + oml.ui.removeAnnotationsDialog().open() } else { console.log('click', id, data) } @@ -113,16 +123,18 @@ oml.ui.annotationPanel = function() { } ], orientation: 'vertical' + }, self).update({ + hasAnnotations: function() { + $menuButton[self.options.hasAnnotations ? 'enableItem' : 'disableItem']('removeAnnotations') + } }); that.updateSelection = function(selection) { - $addQuote.options({ - disabled: !selection - }) var $annotation = oml.$ui.annotationFolder.find('.OMLAnnotation.selected') - $deleteQuote.options({ - disabled: !$annotation.length - }) + $addQuote.options({disabled: !selection}) + $deleteQuote.options({disabled: !$annotation.length}) + $menuButton[selection ? 'enableItem' : 'disableItem']('addAnnotation') + $menuButton[$annotation.length ? 'enableItem' : 'disableItem']('removeAnnotation') } return that; diff --git a/static/js/removeAnnotations.js b/static/js/removeAnnotations.js new file mode 100644 index 0000000..d9e169a --- /dev/null +++ b/static/js/removeAnnotations.js @@ -0,0 +1,48 @@ +'use strict'; + +oml.ui.removeAnnotationsDialog = function() { + + var ui = oml.user.ui, + + annotations = oml.$ui.viewer.getAnnotations().filter(function(a) { + return a.user == oml.user.id + }), + annotationsName = Ox._(annotations.length == 1 ? 'Annotation' : 'Annotations'), + theseAnnotationsName = annotations.length == 1 + ? Ox._('this annotation') + : Ox._('these {0} annotations', [Ox.formatNumber(annotations.length)]), + + that = oml.ui.confirmDialog({ + buttons: [ + Ox.Button({ + style: 'squared', + title: Ox._('No, Keep {0}', [annotationsName]) + }), + Ox.Button({ + style: 'squared', + title: Ox._('Yes, Delete {0}', [annotationsName]) + }) + ], + content: Ox._( + 'Are you sure that you want to permanently delete {0}?', + [theseAnnotationsName] + ), + title: Ox._('Delete {0}', [annotationsName]) + }, function() { + Ox.serialForEach(annotations, function(a, index, annotations, next) { + oml.api.removeAnnotation({ + item: ui.item, + annotation: a.id + }, function(result) { + next() + }) + }, function() { + Ox.Request.clearCache(); + oml.$ui.viewer.renderAnnotations(true); + }) + }); + + return that; + +}; + diff --git a/static/js/viewer.js b/static/js/viewer.js index eb4d902..24c48a2 100644 --- a/static/js/viewer.js +++ b/static/js/viewer.js @@ -111,6 +111,7 @@ oml.ui.viewer = function() { if (save !== false) { oml.api.addAnnotation(a) } + data.user = a.user || oml.user.id data.notes = data.notes || []; annotations.push(data); } @@ -157,9 +158,13 @@ oml.ui.viewer = function() { oml.$ui.annotationFolder.append($annotation); $annotation.annotate(); oml.$ui.annotationPanel.updateSelection(false) + oml.$ui.annotationPanel.options({hasAnnotations: true}) } else if (event == 'removeAnnotation') { oml.$ui.annotationFolder.find('#a-' + data.id).remove() data.id && removeAnnotation(data.id) + oml.$ui.annotationPanel.options({hasAnnotations: annotations.filter(function(a) { + return a.user == oml.user.id + }).length > 0}) } else if (event == 'selectAnnotation') { if (data.id) { var $annotation = oml.$ui.annotationFolder.find('#a-' + data.id) @@ -196,7 +201,7 @@ oml.ui.viewer = function() { that.getAnnotations = function() { return annotations; } - that.renderAnnotations = function() { + that.renderAnnotations = function(load=false) { var sortKey = ui.sortAnnotations if (sortKey == 'date') { sortKey = 'created' @@ -207,9 +212,15 @@ oml.ui.viewer = function() { if (sortKey == 'quote') { sortKey = 'text' } + if (load) { + loadAnnotations(function() { + that.renderAnnotations() + }) + } annotations = Ox.sortBy(annotations, sortKey) oml.$ui.annotationFolder.empty(); var visibleAnnotations = []; + var hasAnnotations = false; annotations.forEach(function(data) { //that.postMessage('removeAnnotation', {id: data.id}) if (ui.showAnnotationUsers == 'all' || data.user == oml.user.id) { @@ -217,7 +228,11 @@ oml.ui.viewer = function() { oml.$ui.annotationFolder.append($annotation); visibleAnnotations.push(data) } + if (data.user == oml.user.id) { + hasAnnotations = true + } }) + oml.$ui.annotationPanel.options({hasAnnotations: hasAnnotations}) // fixme: trigger loaded event from reader instead? setTimeout(function() { that.postMessage('addAnnotations', { @@ -225,6 +240,7 @@ oml.ui.viewer = function() { replace: true }) }, 500) + } return that.updateElement(); }; diff --git a/static/json/js.json b/static/json/js.json index f283185..e493cf5 100644 --- a/static/json/js.json +++ b/static/json/js.json @@ -58,6 +58,7 @@ "preferencesPanel.js", "previewButton.js", "previewDialog.js", + "removeAnnotations.js", "resetUIDialog.js", "rightPanel.js", "sectionButtons.js",