0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:c05d10b6f19b64a6a59532026740d9ceddf2f1d4
Branches Tags
0x2620:master
...
compare: 0x2620:ef16e873a02ec9070f4f75c9dfb5b1144b33bcf2
Branches Tags
0x2620:master

2 commits
c05d10b6f1 ... ef16e873a0

Author SHA1 Message Date
rlx
ef16e873a0 Merge branch 'master' of code.0x2620.org:0x2620/openmedialibrary 2019-02-01 16:26:16 +05:30
rlx
675eca88e7 scroll selected annotation into view if needed 2019-02-01 16:26:05 +05:30
1 changed files with 8 additions and 6 deletions
Show stats Expand all files Collapse all files

14
static/js/annotation.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
oml.ui.annotation = function(annotation, $iframe) { oml.ui.annotation = function(annotation, $iframe) {
var $quotetext = Ox.Element() var $quoteText = Ox.Element()
.addClass('OxSelectable OMLQuote') .addClass('OxSelectable OMLQuote')
.html(Ox.encodeHTMLEntities(annotation.text).replace(/\n/g, '<br/>')) .html(Ox.encodeHTMLEntities(annotation.text).replace(/\n/g, '<br/>'))
.on({ .on({
@ -11,18 +11,19 @@ oml.ui.annotation = function(annotation, $iframe) {
id: annotation.id id: annotation.id
}) })
} }
}) });
var $quoteBackground = Ox.Element().addClass('OMLQuoteBackground');
var $quote = Ox.Element() var $quote = Ox.Element()
.addClass('OMLQuoteBox') .addClass('OMLQuoteBox')
.append( .append(
Ox.Element().addClass('OMLQuoteBackground') $quoteBackground
).append( ).append(
$quotetext $quoteText
) );
var notes = annotation.notes.length ? annotation.notes.map(function(note) { var notes = annotation.notes.length ? annotation.notes.map(function(note) {
note.editable = !note.user note.editable = !note.user
return note return note
}) : [] }) : [];
var $notes = Ox.ArrayEditable({ var $notes = Ox.ArrayEditable({
editing: true, editing: true,
items: notes, items: notes,
@ -96,6 +97,7 @@ oml.ui.annotation = function(annotation, $iframe) {
selected && selected.classList.remove('selected') selected && selected.classList.remove('selected')
that.addClass('selected') that.addClass('selected')
that.gainFocus() that.gainFocus()
that[0].scrollIntoViewIfNeeded()
} }
return that; return that;
}; };