Compare commits

..

No commits in common. "bb18c9155b8a488fd6f127a82bb6df83cfe8d833" and "de67f202a8c29bf626248d314e09cf42c4e0324a" have entirely different histories.

4 changed files with 19 additions and 50 deletions

View file

@ -6,10 +6,8 @@ oml.ui.annotation = function(data, $iframe) {
}).addClass( }).addClass(
'OxSelectable' 'OxSelectable'
).css({ ).css({
borderBottom: '1px solid rgb(208, 208, 208)',
}).append(
Ox.Element().addClass('OxSelectable').css({
backgroundColor: 'white', backgroundColor: 'white',
borderBottom: '1px solid rgb(208, 208, 208)',
color: 'black', color: 'black',
fontFamily: 'Georgia, Palatino, DejaVu Serif, Book Antiqua, Palatino Linotype, Times New Roman, serif', fontFamily: 'Georgia, Palatino, DejaVu Serif, Book Antiqua, Palatino Linotype, Times New Roman, serif',
fontSize: '14px', fontSize: '14px',
@ -21,13 +19,6 @@ oml.ui.annotation = function(data, $iframe) {
id: data.id id: data.id
}) })
} }
}) });
).append(
Ox.ArrayEditable({
type: 'textarea'
}).css({
height: 0
})
);
return that; return that;
}; };

View file

@ -1,10 +0,0 @@
oml.ui.annotationFolder = function() {
var ui = oml.user.ui,
that = Ox.Element().css({
overflowY: 'auto',
});
return that;
};

View file

@ -3,19 +3,9 @@
oml.ui.annotationPanel = function() { oml.ui.annotationPanel = function() {
var ui = oml.user.ui, var ui = oml.user.ui,
that = Ox.SplitPanel({ that = Ox.Element().css({
elements: [ overflowY: 'auto',
{ });
element: Ox.Bar({size: 16}),
size: 16
},
{
element: oml.$ui.annotationFolder = oml.ui.annotationFolder()
}
],
orientation: 'vertical'
})
return that; return that;
}; };

View file

@ -25,8 +25,6 @@ oml.ui.viewer = function() {
collapsed: !ui.showAnnotations, collapsed: !ui.showAnnotations,
collapsible: true, collapsible: true,
element: oml.$ui.annotationPanel = oml.ui.annotationPanel(), element: oml.$ui.annotationPanel = oml.ui.annotationPanel(),
resizable: true,
resize: [128, 384],
size: 256, size: 256,
tooltip: Ox._('Annotations') tooltip: Ox._('Annotations')
+ ' <span class="OxBright">' + ' <span class="OxBright">'
@ -43,7 +41,7 @@ oml.ui.viewer = function() {
if (item && item.length) { if (item && item.length) {
oml.api.get({id: item, keys: ['mediastate']}, function(result) { oml.api.get({id: item, keys: ['mediastate']}, function(result) {
if (result.data.mediastate == 'available') { if (result.data.mediastate == 'available') {
oml.$ui.annotationFolder.empty() oml.$ui.annotationPanel.empty()
if ($iframe) { if ($iframe) {
$iframe.remove() $iframe.remove()
} }
@ -55,10 +53,10 @@ oml.ui.viewer = function() {
console.log('got', event, data) console.log('got', event, data)
if (event == 'addAnnotation') { if (event == 'addAnnotation') {
console.log('adding', data.id) console.log('adding', data.id)
oml.$ui.annotationFolder.append(oml.ui.annotation(data, $iframe)); oml.$ui.annotationPanel.append(oml.ui.annotation(data, $iframe));
} else if (event == 'removeAnnotation') { } else if (event == 'removeAnnotation') {
console.log('do it ...', data) console.log('do it ...', data)
oml.$ui.annotationFolder.find('#a-' + data.id).remove() oml.$ui.annotationPanel.find('#a-' + data.id).remove()
} else if (event == 'selectAnnotation') { } else if (event == 'selectAnnotation') {
console.log('select', data) console.log('select', data)
} else if (event == 'deselectAnnotation') { } else if (event == 'deselectAnnotation') {