source/UI/css/UI.css

@@ -16,9 +16,6 @@ a:hover, .OxLink:hover {
 blockquote {
     margin: 0 1.5em 0 1.5em;
 }
-html, body {
-    overscroll-behavior: none;
-}
 body {
     margin: 0;
     cursor: default;

source/UI/js/Form/ArrayEditable.js

@@ -25,7 +25,6 @@ Ox.ArrayEditable = function(options, self) {
     var that = Ox.Element({}, self)
         .defaults({
             clickLink: null,
-            confirmDeleteDialog: null,
             editable: true,
             format: null,
             getSortValue: null,
@@ -117,31 +116,23 @@ Ox.ArrayEditable = function(options, self) {
 
     self.selected = getSelectedPosition();
 
-    function deleteItem(id, empty) {
+    function deleteItem(id) {
         // it is possible to delete an (empty-value) item
         // by selecting another one
         id = id || self.options.selected;
-
+        var position = Ox.getIndexById(self.options.items, id)
-        (self.options.confirmDeleteDialog && !empty ? self.options.confirmDeleteDialog: Ox.noop)({
+        if (self.options.editable) {
-            items: Ox.isArray(id) ? id : [id],
+            self.options.items.splice(position, 1);
-        }, function(result) {
+            renderItems();
-            if (self.options.editable) {
+            that.triggerEvent('delete', {id: id});
-                (Ox.isArray(id) ? id : [id]).forEach(id => {
+            self.editing = false;
-                    var position = Ox.getIndexById(self.options.items, id)
+            if (self.options.selected == id) {
-                    self.options.items.splice(position, 1);
+                self.selected = -1;
-                    that.triggerEvent('delete', {id: id});
+                self.options.selected = '';
-                })
+            } else if (self.options.selected) {
-                renderItems();
+                self.selected = Ox.getIndexById(self.options.item, self.options.selected)
-                self.editing = false;
-                if (self.options.selected == id) {
-                    self.selected = -1;
-                    self.options.selected = '';
-                } else if (self.options.selected) {
-                    self.selected = Ox.getIndexById(self.options.item, self.options.selected)
-                }
             }
-        })
+        }
-
     }
 
     function doubleclick(e) {
@@ -155,20 +146,12 @@ Ox.ArrayEditable = function(options, self) {
         }
     }
 
-    function getId(position) {
-        return position > -1 ? self.options.items[position].id : '';
-    }
-
     function getSelectedId() {
-        return getId(self.selected);
+        return self.selected > -1 ? self.options.items[self.selected].id : '';
-    }
-
-    function getPosition(id) {
-        return Ox.getIndexById(self.options.items, id);
     }
 
     function getSelectedPosition() {
-        return getPosition(self.options.selected);
+        return Ox.getIndexById(self.options.items, self.options.selected);
     }
 
     function renderItems(blur) {
@@ -284,50 +267,6 @@ Ox.ArrayEditable = function(options, self) {
                 : that.triggerEvent('selectprevious');
         }
     }
-    function toggleItem(idOrPosition) {
-        var id, position;
-        if (Ox.isString(idOrPosition)) {
-            id = idOrPosition
-            position = getPosition(id);
-        } else {
-            position = idOrPosition
-            id = getId(position);
-        }
-        if (!Ox.isArray(self.options.selected)) {
-            self.options.selected = [self.options.selected]
-        }
-        if (!Ox.isArray(self.selected)) {
-            self.selected = [self.selected]
-        }
-        if (!self.options.selected.includes(id)) {
-            var minPos, maxPos;
-            if (Ox.min(self.selected) > position) {
-                minPos = position
-                maxPos = Ox.min(self.selected)
-            } else {
-                minPos = Ox.max(self.selected) + 1
-                maxPos = position + 1
-            }
-            Ox.range(minPos, maxPos).forEach(pos => {
-                self.selected.push(pos)
-                self.options.selected.push(getId(pos))
-            })
-
-        }
-        that.find('.OxSelected').removeClass('OxSelected').removeClass('OxMultiple');
-        that.find('.OxGroup').removeClass('OxGroup')
-        if (self.options.selected.length == 1) {
-            self.options.selected = self.options.selected[0]
-            self.selected = self.selected[0]
-            self.$items[self.selected].addClass('OxSelected');
-            self.options.highlightGroup && that.updateItemGroup()
-        } else {
-            Ox.forEach(self.selected, function(selected) {
-                self.$items[selected].addClass('OxSelected').addClass('OxMultiple');
-            })
-        }
-        triggerSelectEvent();
-    }
 
     function selectItem(idOrPosition) {
         if (Ox.isString(idOrPosition)) {
@@ -388,14 +327,8 @@ Ox.ArrayEditable = function(options, self) {
                 position = $element.data('position');
                 // if clicked on an element
                 if (position != self.selected) {
-                    if (e.shiftKey && self.selected != -1) {
+                    // select another item
-                        // add/remove item from multiple selection
+                    selectItem(position);
-                        document.getSelection().removeAllRanges();
-                        toggleItem(position);
-                    } else {
-                        // select another item
-                        selectItem(position);
-                    }
                 } else if (e.metaKey) {
                     // or deselect current item
                     selectNone();
@@ -437,7 +370,7 @@ Ox.ArrayEditable = function(options, self) {
         var item = Ox.getObjectById(self.options.items, id);
         Ox.Log('AE', 'submitItem', id, item)
         if (value === '') {
-            deleteItem(item.id, true);
+            deleteItem(item.id);
         } else {
             that.triggerEvent(item.value === value ? 'blur' : 'submit', {
                 id: item.id,

source/UI/js/Video/AnnotationFolder.js

@@ -35,7 +35,6 @@ Ox.AnnotationFolder = function(options, self) {
     var that = Ox.Element({}, self)
         .defaults({
             clickLink: null,
-            confirmDeleteDialog: null,
             collapsed: false,
             editable: false,
             highlight: '',
@@ -282,7 +281,6 @@ Ox.AnnotationFolder = function(options, self) {
     }
     self.$annotations = Ox.ArrayEditable(Ox.extend({
             clickLink: self.options.clickLink,
-            confirmDeleteDialog: self.options.confirmDeleteDialog,
             editable: self.options.editable,
             getSortValue: self.options.type == 'text'
                 ? function(value) {
@@ -581,40 +579,26 @@ Ox.AnnotationFolder = function(options, self) {
 
     function selectAnnotation(data) {
         if (self.loaded) {
-            var extendedData;
+            var item = Ox.getObjectById(self.options.items, data.id);
-            if (Ox.isArray(data.id) && data.id.length) {
+            self.options.selected = item ? data.id : '';
-                var items = data.id.map(id => {
+            if (self.widget) {
-                    return Ox.getObjectById(self.options.items, id);
+                if (self.options.type == 'event') {
-                })
+                    self.$calendar.options({
-                self.options.selected = data.id;
+                            selected: item && isDefined(item) ? item.event.id : ''
-                extendedData = Ox.extend(data, {
+                        })
-                    'in': Ox.min(items.map(item => { return item["in"]; })),
+                        .panToEvent();
-                    out: Ox.max(items.map(item => { return item["out"]; })),
+                } else {
-                    layer: self.options.id
+                    self.$map.options({
-                });
+                            selected: item && isDefined(item) ? item.place.id : ''
-            } else {
+                        })
-                var item = Ox.getObjectById(self.options.items, data.id)
+                        .panToPlace();
-                self.options.selected = item ? data.id : '';
-                if (self.widget) {
-                    if (self.options.type == 'event') {
-                        self.$calendar.options({
-                                selected: item && isDefined(item) ? item.event.id : ''
-                            })
-                            .panToEvent();
-                    } else {
-                        self.$map.options({
-                                selected: item && isDefined(item) ? item.place.id : ''
-                            })
-                            .panToPlace();
-                    }
                 }
-                extendedData = Ox.extend(data, item ? {
-                    'in': item['in'],
-                    out: item.out,
-                    layer: self.options.id
-                } : {});
             }
-            that.triggerEvent('select', extendedData)
+            that.triggerEvent('select', Ox.extend(data, item ? {
+                'in': item['in'],
+                out: item.out,
+                layer: self.options.id
+            } : {}));
         }
     }
 

source/UI/js/Video/AnnotationPanel.js

@@ -48,11 +48,9 @@ Ox.AnnotationPanel = function(options, self) {
         .defaults({
             calendarSize: 256,
             clickLink: null,
-            confirmDeleteDialog: null,
             editable: false,
             enableExport: false,
             enableImport: false,
-            enableTranscribe: false,
             highlight: '',
             highlightAnnotations: 'none',
             highlightLayer: '*',
@@ -305,11 +303,7 @@ Ox.AnnotationPanel = function(options, self) {
                     {},
                     {id: 'import', title: Ox._('Import Annotations...'), disabled: !self.options.enableImport},
                     {id: 'export', title: Ox._('Export Annotations...'), disabled: !self.options.enableExport},
-                ].concat(
+                ]
-                    self.options.enableTranscribe ? [
-                        {id: 'transcribeaudio', title: Ox._('Transcribe Audio...')},
-                    ]: []
-                )
             ),
             maxWidth: 256,
             style: 'square',
@@ -357,8 +351,6 @@ Ox.AnnotationPanel = function(options, self) {
                     // ...
                 } else if (data.id == 'showentityinfo') {
                     that.triggerEvent('showentityinfo', annotation.entity);
-                } else if (data.id == 'transcribeaudio') {
-                    that.triggerEvent('transcribeaudio');
                 } else if (data.id == 'undo') {
                     // ...
                 }
@@ -379,7 +371,6 @@ Ox.AnnotationPanel = function(options, self) {
         self.$folder[index] = Ox.AnnotationFolder(
                 Ox.extend({
                     clickLink: self.options.clickLink,
-                    confirmDeleteDialog: self.options.confirmDeleteDialog,
                     collapsed: !self.options.showLayers[layer.id],
                     editable: self.options.editable,
                     highlight: getHighlight(layer.id),

source/UI/js/Video/VideoAnnotationPanel.js

@@ -61,13 +61,11 @@ Ox.VideoAnnotationPanel = function(options, self) {
                 censoredIcon: '',
                 censoredTooltip: '',
                 clickLink: null,
-                confirmDeleteDialog: null,
                 cuts: [],
                 duration: 0,
                 enableDownload: false,
                 enableImport: false,
                 enableExport: false,
-                enableTranscribe: false,
                 enableSetPosterFrame: false,
                 enableSubtitles: false,
                 find: '',
@@ -846,11 +844,9 @@ Ox.VideoAnnotationPanel = function(options, self) {
             autocomplete: self.options.autocomplete,
             calendarSize: self.options.annotationsCalendarSize,
             clickLink: self.options.clickLink,
-            confirmDeleteDialog: self.options.confirmDeleteDialog,
             editable: true,
             enableExport: self.options.enableExport,
             enableImport: self.options.enableImport,
-            enableTranscribe: self.options.enableTranscribe,
             highlight: self.options.find,
             highlightAnnotations: self.options.annotationsHighlight,
             highlightLayer: self.options.findLayer,
@@ -953,9 +949,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
                 that.triggerEvent('showentityinfo', data);
             },
             submit: submitAnnotation,
-            transcribeaudio: function() {
-                that.triggerEvent('transcribeaudio');
-            },
             toggle: toggleAnnotations,
             togglecalendar: function(data) {
                 self.options.showAnnotationsCalendar = !data.collapsed;