diff --git a/source/Ox.UI/js/Video/AnnotationPanel.js b/source/Ox.UI/js/Video/AnnotationPanel.js index 817d050d..8a40d77e 100644 --- a/source/Ox.UI/js/Video/AnnotationPanel.js +++ b/source/Ox.UI/js/Video/AnnotationPanel.js @@ -8,14 +8,12 @@ Ox.AnnotationPanel Video Annotation Panel calendarSize calendar size clickLink click link callback editable if true, annotations can be edited - font small, medium, large highlight highlight given string in annotations layers array with annotation objects mapSize map size range all, position, selection selected selected annotation showCalendar if true, calendar is shown - showFonts if true, option to select font size is show showLayers object with layers to show showMap if true, show map showUsers if true show user @@ -49,7 +47,6 @@ Ox.AnnotationPanel = function(options, self) { calendarSize: 256, clickLink: null, editable: false, - font: 'small', highlight: '', itemName: {singular: 'video', plural: 'videos'}, layers: [], @@ -57,7 +54,6 @@ Ox.AnnotationPanel = function(options, self) { range: 'all', selected: '', showCalendar: false, - showFonts: false, showLayers: {}, showMap: false, showUsers: false, @@ -311,7 +307,6 @@ Ox.AnnotationPanel = function(options, self) { clickLink: self.options.clickLink, collapsed: !self.options.showLayers[layer.id], editable: self.options.editable, - font: self.options.font, highlight: self.options.highlight, 'in': self.options['in'], keyboard: index + 1 + '', @@ -424,15 +419,6 @@ Ox.AnnotationPanel = function(options, self) { {id: 'text', title: Ox._('By Text'), checked: self.options.sort == 'text'} ]} ], - self.options.showFonts ? [ - {}, - {id: 'fontsize', title: Ox._('Font Size'), disabled: true}, - {group: 'font', min: 1, max: 1, items: [ - {id: 'small', title: Ox._('Small'), checked: self.options.font == 'small'}, - {id: 'medium', title: Ox._('Medium'), checked: self.options.font == 'medium'}, - {id: 'large', title: Ox._('Large'), checked: self.options.font == 'large'} - ]} - ] : [], self.options.showUsers && self.users.length ? [ {}, {id: 'users', title: Ox._('Show Users'), disabled: true}, diff --git a/source/Ox.UI/js/Video/ClipPanel.js b/source/Ox.UI/js/Video/ClipPanel.js index 9e2b1c47..acfac9f3 100644 --- a/source/Ox.UI/js/Video/ClipPanel.js +++ b/source/Ox.UI/js/Video/ClipPanel.js @@ -6,7 +6,6 @@ Ox.ClipPanel = function(options, self) { var that = Ox.Element({}, self) .defaults({ annotationsCalendarSize: 256, - annotationsFont: 'small', annotationsMapSize: 256, annotationsRange: 'all', annotationsSort: 'position', @@ -401,7 +400,6 @@ Ox.ClipPanel = function(options, self) { calendarSize: self.options.annotationsCalendarSize, clickLink: self.options.clickLink, editable: false, - font: self.options.annotationsFont, //highlight: self.options.find, //'in': self.options['in'], layers: self.options.layers, diff --git a/source/Ox.UI/js/Video/VideoAnnotationPanel.js b/source/Ox.UI/js/Video/VideoAnnotationPanel.js index 88764661..7cadf44b 100644 --- a/source/Ox.UI/js/Video/VideoAnnotationPanel.js +++ b/source/Ox.UI/js/Video/VideoAnnotationPanel.js @@ -6,7 +6,6 @@ Ox.VideoAnnotationPanel VideoAnnotationPanel Object self Shared private variable ([options[, self]]) -> VideoAnnotationPanel Object addannotation addannotation - annotationsfont annotationsfont annotationsrange annotationsrange annotationssize annotationssize annotationssort annotationssort @@ -46,7 +45,6 @@ Ox.VideoAnnotationPanel = function(options, self) { var that = Ox.Element({}, self) .defaults({ annotationsCalendarSize: 256, - annotationsFont: 'small', annotationsMapSize: 256, annotationsRange: 'all', annotationsSize: 256, @@ -741,7 +739,6 @@ Ox.VideoAnnotationPanel = function(options, self) { calendarSize: self.options.annotationsCalendarSize, clickLink: self.options.clickLink, editable: true, - font: self.options.annotationsFont, highlight: self.options.find, 'in': self.options['in'], itemName: self.options.itemName, @@ -762,10 +759,6 @@ Ox.VideoAnnotationPanel = function(options, self) { add: function(data) { addAnnotation(data.layer); }, - annotationsfont: function(data) { - self.options.annotationsFont = data.font; - that.triggerEvent('annotationsfont', data); - }, annotationsrange: function(data) { self.options.annotationsRange = data.range; that.triggerEvent('annotationsrange', data); diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js index e5c6f3f4..b61e8868 100644 --- a/source/Ox.UI/js/Video/VideoEditPanel.js +++ b/source/Ox.UI/js/Video/VideoEditPanel.js @@ -6,7 +6,6 @@ Ox.VideoEditPanel = function(options, self) { var that = Ox.Element({}, self) .defaults({ annotationsCalendarSize: 256, - annotationsFont: 'small', annotationsMapSize: 256, annotationsRange: 'all', annotationsSort: 'position', @@ -327,7 +326,6 @@ Ox.VideoEditPanel = function(options, self) { self.$clipPanel = Ox.ClipPanel({ annotationsCalendarSize: self.options.annotationsCalendarSize, - annotationsFont: self.options.annotationsFont, annotationsMapSize: self.options.annotationsMapSize, annotationsRange: self.options.annotationsRange, annotationsSort: self.options.annotationsSort, diff --git a/source/Ox.UI/js/Video/VideoPlayerPanel.js b/source/Ox.UI/js/Video/VideoPlayerPanel.js index 9b94e6b6..08b0997d 100644 --- a/source/Ox.UI/js/Video/VideoPlayerPanel.js +++ b/source/Ox.UI/js/Video/VideoPlayerPanel.js @@ -5,7 +5,6 @@ Ox.VideoPlayerPanel VideoPlayerPanel Object options Options object self Shared private variable ([options[, self]]) -> VideoPlayerPanel Object - annotationsfont annotationsfont annotationsrange annotationsrange annotationssize annotationssize annotationssort annotationssort @@ -36,7 +35,6 @@ Ox.VideoPlayerPanel = function(options, self) { var that = Ox.Element({}, self) .defaults({ annotationsCalendarSize: 256, - annotationsFont: 'small', annotationsMapSize: 256, annotationsRange: 'all', annotationsSize: 256, @@ -334,7 +332,6 @@ Ox.VideoPlayerPanel = function(options, self) { calendarSize: self.options.annotationsCalendarSize, clickLink: self.options.clickLink, editable: false, - font: self.options.annotationsFont, highlight: self.options.find, 'in': self.options['in'], itemName: self.options.itemName, @@ -345,7 +342,6 @@ Ox.VideoPlayerPanel = function(options, self) { range: self.options.annotationsRange, selected: self.options.selected, showCalendar: self.options.showAnnotationsCalendar, - showFonts: true, showLayers: Ox.clone(self.options.showLayers), showMap: self.options.showAnnotationsMap, showUsers: self.options.showUsers, @@ -353,10 +349,6 @@ Ox.VideoPlayerPanel = function(options, self) { width: self.options.annotationsSize }) .bindEvent({ - annotationsfont: function(data) { - self.options.annotationsFont = data.font; - that.triggerEvent('annotationsfont', data); - }, annotationsrange: function(data) { self.options.annotationsRange = data.range; that.triggerEvent('annotationsrange', data); diff --git a/source/Ox.UI/js/Video/VideoTimelinePanel.js b/source/Ox.UI/js/Video/VideoTimelinePanel.js index 09f28202..48adecd7 100644 --- a/source/Ox.UI/js/Video/VideoTimelinePanel.js +++ b/source/Ox.UI/js/Video/VideoTimelinePanel.js @@ -6,7 +6,6 @@ Ox.VideoTimelinePanel Video timeline panel self Shared private variable ([options[, self]]) -> Video timeline panel annoationssize annoationssize - annotationsfont annotationsfont annotationsrange annotationsrange annotationssort annotationssort censored censored @@ -32,7 +31,6 @@ Ox.VideoTimelinePanel = function(options, self) { var that = Ox.Element({}, self) .defaults({ annotationsCalendarSize: 256, - annotationsFont: 'small', annotationsMapSize: 256, annotationsRange: 'all', annotationsSize: 256, @@ -163,7 +161,6 @@ Ox.VideoTimelinePanel = function(options, self) { calendarSize: self.options.annotationsCalendarSize, clickLink: self.options.clickLink, editable: false, - font: self.options.annotationsFont, highlight: self.options.find, 'in': self.options['in'], itemName: self.options.itemName, @@ -174,7 +171,6 @@ Ox.VideoTimelinePanel = function(options, self) { range: self.options.annotationsRange, selected: self.options.selected, showCalendar: self.options.showAnnotationsCalendar, - showFonts: true, showLayers: Ox.clone(self.options.showLayers), showMap: self.options.showAnnotationsMap, showUsers: self.options.showUsers, @@ -182,10 +178,6 @@ Ox.VideoTimelinePanel = function(options, self) { width: self.options.annotationsSize }) .bindEvent({ - annotationsfont: function(data) { - self.options.annotationsFont = data.font; - that.triggerEvent('annotationsfont', data); - }, annotationsrange: function(data) { self.options.annotationsRange = data.range; that.triggerEvent('annotationsrange', data);