Merge branch 'master' of code.0x2620.org:0x2620/openmedialibrary

static/js/annotationPanel.js

@@ -31,6 +31,8 @@ oml.ui.annotationPanel = function() {
                 {id: 'note', title: Ox._('By Note Text'), checked: false},
                 {id: 'date', title: Ox._('By Date Added'), checked: false}
             ]},
+            {},
+            {id: 'exportAnnotations', title: Ox._('Export Annotations')},
         ],
         style: 'square',
         title: 'set',
@@ -39,7 +41,20 @@ oml.ui.annotationPanel = function() {
     }).css({
         // borderColor: 'transparent',
         float: 'right'
-    }).appendTo($bar);
+    }).appendTo($bar)
+    .bindEvent({
+        click: function(data) {
+            var id = data.id;
+            if (id == 'exportAnnotations') {
+                oml.api.get({
+                    id: oml.user.ui.item,
+                    keys: []
+                }, function(result) {
+                    oml.ui.exportAnnotationsDialog(result.data).open()
+                })
+            }
+        }
+    });
 
     var ui = oml.user.ui;
     var that = Ox.SplitPanel({

static/js/exportAnnotationsDialog.js

@@ -0,0 +1,62 @@
+'use strict';
+
+oml.ui.exportAnnotationsDialog = function(data) {
+
+    var ui = oml.user.ui,
+
+        $text = Ox.Input({
+                type: 'textarea',
+                style: 'squared',
+                value: getAnnotationsText(),
+                width: 640,
+                height: 480
+            })
+            .css({margin: '16px'}),
+
+        that = Ox.Dialog({
+            buttons: [
+                Ox.Button({
+                    id: 'done',
+                    style: 'squared',
+                    title: Ox._('Done')
+                })
+                .bindEvent({
+                    click: function() {
+                        that.close();
+                    }
+                })
+            ],
+            closeButton: true,
+            content: $text,
+            height: 480 + 2 * 16,
+            keys: {enter: 'done'},
+            removeOnClose: true,
+            title: Ox._('Export Annotations'),
+            width: 640 + 2* 16
+        })
+        .bindEvent({
+            close: function() {
+                that.close();
+            },
+            open: function() {
+                // ..
+            }
+        });
+
+    function getAnnotationsText() {
+        var annotations = oml.$ui.viewer.getAnnotations()
+        var text = 'Annotations for ' + data.title + ' (' + data.author.join(', ') + ')\n\n\n\n'
+        text += annotations.map(function(annotation) {
+            var text = 'Quote:\n\n' + annotation.text
+            if (annotation.notes.length) {
+                text += '\n\nNotes:\n' + annotation.notes.map(function(note) {
+                    return note.value
+                }).join('\n\n')
+            }
+            return text
+        }).join('\n\n\n\n')
+        return text
+    }
+    return that;
+
+};

static/js/viewer.js

@@ -143,6 +143,8 @@ oml.ui.viewer = function() {
     that.postMessage = function(event, data) {
         $iframe && $iframe.postMessage(event, data)
     };
-
+    that.getAnnotations = function() {
+        return annotations;
+    }
     return that.updateElement();
 };

static/json/js.json

@@ -19,6 +19,7 @@
     "deleteListDialog.js",
     "editDialog.js",
     "errorDialog.js",
+    "exportAnnotationsDialog.js",
     "filter.js",
     "filtersInnerPanel.js",
     "filtersOuterPanel.js",

static/reader/epub.js

@@ -113,9 +113,7 @@ function getText(book, cfiRange, cb) {
 
 function onHighlightClicked(e) {
     console.log("highlight clicked", e.target.dataset.epubcfi);
-    if(e.target.classList.contains('selected')) {
-        e.target.classList.remove('selected')
-    } else {
+    if(!e.target.classList.contains('selected')) {
         document.querySelectorAll('.epubjs-hl.selected').forEach(function(other) {
             other.classList.remove('selected')
         })

static/reader/pdf.js

@@ -22,7 +22,7 @@ Ox.load({
             }
             setTimeout(function() {
                 var el = document.querySelector('.a' + annotation.id);
-                if (el) {
+                if (el && !isInView(el)) {
                     document.querySelector('#viewerContainer').scrollTop = el.offsetTop + el.parentElement.offsetTop - 64;
                 }
             }, delay)
@@ -134,10 +134,7 @@ function renderAnnotation(annotation) {
             'width:' + Math.abs(bounds[0] - bounds[2]) + 'px; height:' + Math.abs(bounds[1] - bounds[3]) + 'px;');
 
         el.addEventListener('click', function() {
-            if (el.classList.contains('selected')) {
-                deselectAnnotation(annotation.id)
-                Ox.$parent.postMessage('selectAnnotation', {id: null})
-            } else {
+            if (!el.classList.contains('selected')) {
                 selectAnnotation(annotation.id)
                 Ox.$parent.postMessage('selectAnnotation', {id: annotation.id})
             }
@@ -204,3 +201,10 @@ function loadAnnotations(page) {
     })
 }
 
+function isInView(element) {
+    var docViewTop = $(window).scrollTop();
+    var docViewBottom = docViewTop + $(window).height();
+    var elementTop = $(element).offset().top;
+    var elementBottom = elementTop + $(element).height();
+    return elementTop < docViewBottom && elementBottom > docViewTop;
+}