diff --git a/oml/fulltext.py b/oml/fulltext.py index 4ebe255..d1cd5ee 100644 --- a/oml/fulltext.py +++ b/oml/fulltext.py @@ -2,7 +2,6 @@ import logging import os import subprocess import sys -from urllib.parse import quote, unquote from sqlalchemy.sql import operators @@ -15,8 +14,6 @@ def get_prefix(): def get_ids(books): from item.models import File - if not books: - return [] ids = [b[0] for b in File.query.filter(operators.in_op(File.path, books)).values('sha1')] return ids @@ -35,31 +32,13 @@ def find_fulltext_windows(query): books = [b.split(':')[0] for b in books] return get_ids(books, prefix) -def find_fulltext_linux(query): - prefix = get_prefix() - prefix_url = quote(prefix) - cmd = [ - 'tracker', - 'sparql', - '-q', - "SELECT nie:url(?f) WHERE { ?f fts:match '%s' FILTER (tracker:uri-is-descendant ('file://%s', nie:url (?f))) }" % (query, prefix_url) - ] - books = subprocess.check_output(cmd).decode().strip().split('\n') - books = [ - unquote(r.strip()).replace('file://', '')[len(prefix):] - for r in books if r.strip().startswith('file://') - ] - return get_ids(books) - def find_fulltext(query): ids = [] if sys.platform == 'darwin': ids = find_fulltext_macos(query) - elif sys.platform == 'linux': - ids = find_fulltext_linux(query) else: logger.debug('missing fulltext search implementation for %s', sys.platform) return ids def platform_supported(): - return sys.platform in ('darwin', 'linux') + return sys.platform == 'darwin' diff --git a/static/css/oml.css b/static/css/oml.css index 375341b..946e463 100644 --- a/static/css/oml.css +++ b/static/css/oml.css @@ -39,13 +39,3 @@ .OxAnnotationFolder div.OxInput { background-image: none; } - -.OxThemeOxlight .OxAnnotationFolder { - background-color: rgb(240, 240, 240); -} -.OxThemeOxmedium .OxAnnotationFolder { - background-color: rgb(144, 144, 144); -} -.OxThemeOxdark .OxAnnotationFolder { - background-color: rgb(16, 16, 16); -} diff --git a/static/js/annotation.js b/static/js/annotation.js index 6df2090..13887c6 100644 --- a/static/js/annotation.js +++ b/static/js/annotation.js @@ -73,11 +73,9 @@ oml.ui.annotation = function(annotation, $iframe) { borderBottom: '1px solid rgb(208, 208, 208)', }).bindEvent({ key_delete: function() { - if (annotation.user == oml.user.id) { - that.triggerEvent('delete', { - id: annotation.id - }) - } + that.triggerEvent('delete', { + id: annotation.id + }) } }).append($quote).append($notes); @@ -100,11 +98,9 @@ oml.ui.annotation = function(annotation, $iframe) { } } that.delete = function() { - if (annotation.user == oml.user.id) { - that.triggerEvent('delete', { - id: annotation.id - }) - } + that.triggerEvent('delete', { + id: annotation.id + }) } that.deselect = function() { that.removeClass('selected') diff --git a/static/js/folders.js b/static/js/folders.js index 9e8718e..b96e9c7 100644 --- a/static/js/folders.js +++ b/static/js/folders.js @@ -111,11 +111,6 @@ oml.ui.folders = function() { oml.UI.set({find: getFind('')}); oml.$ui.librariesList.options({selected: ['']}); }, - singleclick: function(data) { - oml.UI.set({ - find: getFind('') - }); - }, selectnext: function() { oml.UI.set(Ox.extend( {find: getFind(':')}, @@ -206,14 +201,7 @@ oml.ui.folders = function() { !index && oml.addList(); }, select: function(data) { - oml.UI.set({ - find: getFind(data.ids[0]), - }); - }, - singleclick: function(data) { - oml.UI.set({ - find: getFind(oml.$ui.libraryList[index].options('selected')[0]) - }); + oml.UI.set({find: getFind(data.ids[0])}); }, selectnext: function() { oml.UI.set({find: getFind(inboxId)}); @@ -302,11 +290,6 @@ oml.ui.folders = function() { open: function(data) { !index && !Ox.contains(data.ids, ':Inbox') && oml.ui.listDialog().open(); }, - singleclick: function(data) { - oml.UI.set({ - find: getFind(oml.$ui.folderList[index].options('selected')[0]) - }); - }, select: function(data) { oml.UI.set({find: getFind(data.ids[0])}); }, diff --git a/static/js/fullscreenButton.js b/static/js/fullscreenButton.js index f8b49d0..5ab741e 100644 --- a/static/js/fullscreenButton.js +++ b/static/js/fullscreenButton.js @@ -16,7 +16,7 @@ oml.ui.fullscreenButton = function() { }) .bindEvent({ click: function() { - Ox.Fullscreen.enter(oml.$ui.viewer[0]); + Ox.Fullscreen.enter(oml.$ui.viewer.find('iframe')[0]); }, oml_itemview: function() { that.updateElement(); @@ -31,4 +31,4 @@ oml.ui.fullscreenButton = function() { return that.updateElement(); -}; +}; \ No newline at end of file diff --git a/static/js/itemViewPanel.js b/static/js/itemViewPanel.js index e7aa45c..8052978 100644 --- a/static/js/itemViewPanel.js +++ b/static/js/itemViewPanel.js @@ -17,7 +17,7 @@ oml.ui.itemViewPanel = function() { ], orientation: 'horizontal', selected: ui.itemView, - size: window.innerWidth - (ui.showSidebar ? ui.sidebarSize : 0) - 1 + size: window.innerWidth - ui.sidebarSize - 1 }) .bindEvent({ oml_itemview: function(data) { @@ -27,4 +27,4 @@ oml.ui.itemViewPanel = function() { return that; -}; +}; \ No newline at end of file diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js index f9e9388..039595a 100644 --- a/static/js/mainMenu.js +++ b/static/js/mainMenu.js @@ -566,7 +566,7 @@ oml.ui.mainMenu = function() { ? 'openPreview' : 'closePreview' ](); } else if (id == 'fullscreen') { - Ox.Fullscreen.enter(oml.$ui.viewer[0]); + Ox.Fullscreen.enter(oml.$ui.viewer.find('iframe')[0]); } else if (id == 'debugmode') { if (oml.localStorage('enableDebugMode')) { oml.localStorage['delete']('enableDebugMode'); diff --git a/static/js/viewer.js b/static/js/viewer.js index eb4d902..362e178 100644 --- a/static/js/viewer.js +++ b/static/js/viewer.js @@ -61,10 +61,7 @@ oml.ui.viewer = function() { note = data.notes[0] delete data.notes } - var a = Ox.extend({}, data) - a.created = a.created || (new Date).toISOString(); - a.item = ui.item - oml.api.addAnnotation(a) + addAnnotation(data, false) if (note) { data.notes = [note] } else { @@ -93,14 +90,9 @@ oml.ui.viewer = function() { oml.api.getAnnotations({ id: ui.item }, function(result) { - if (!result.data.annotations.length && localStorage[oml.user.ui.item + '.annotations_']) { - localStorage[oml.user.ui.item + '.annotations'] = localStorage[oml.user.ui.item + '.annotations_'] - loadAnnotations(callback) - - } else { - annotations = result.data.annotations - callback && callback(annotations) - } + console.log(result) + annotations = result.data.annotations + callback && callback(annotations) }) } }