0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

remove annotations font size

Browse source
This commit is contained in:
rolux 2014-02-18 06:34:08 +00:00
parent 36bb548879
commit 978cc88618
6 changed files with 0 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/Ox.UI/js/Video/AnnotationPanel.js
View file

@ -8,14 +8,12 @@ Ox.AnnotationPanel <f> Video Annotation Panel
calendarSize <n|256> calendar size calendarSize <n|256> calendar size
clickLink <f|null> click link callback clickLink <f|null> click link callback
editable <b|false> if true, annotations can be edited editable <b|false> if true, annotations can be edited
font <s|'small'> small, medium, large
highlight <s|''> highlight given string in annotations highlight <s|''> highlight given string in annotations
layers <a|[]> array with annotation objects layers <a|[]> array with annotation objects
mapSize <n|256> map size mapSize <n|256> map size
range <s|'all'> all, position, selection range <s|'all'> all, position, selection
selected <s|''> selected annotation selected <s|''> selected annotation
showCalendar <b|false> if true, calendar is shown showCalendar <b|false> if true, calendar is shown
showFonts <b|false> if true, option to select font size is show
showLayers <o|{}> object with layers to show showLayers <o|{}> object with layers to show
showMap <b|false> if true, show map showMap <b|false> if true, show map
showUsers <b|false> if true show user showUsers <b|false> if true show user
@ -49,7 +47,6 @@ Ox.AnnotationPanel = function(options, self) {
calendarSize: 256, calendarSize: 256,
clickLink: null, clickLink: null,
editable: false, editable: false,
font: 'small',
highlight: '', highlight: '',
itemName: {singular: 'video', plural: 'videos'}, itemName: {singular: 'video', plural: 'videos'},
layers: [], layers: [],
@ -57,7 +54,6 @@ Ox.AnnotationPanel = function(options, self) {
range: 'all', range: 'all',
selected: '', selected: '',
showCalendar: false, showCalendar: false,
showFonts: false,
showLayers: {}, showLayers: {},
showMap: false, showMap: false,
showUsers: false, showUsers: false,
@ -311,7 +307,6 @@ Ox.AnnotationPanel = function(options, self) {
clickLink: self.options.clickLink, clickLink: self.options.clickLink,
collapsed: !self.options.showLayers[layer.id], collapsed: !self.options.showLayers[layer.id],
editable: self.options.editable, editable: self.options.editable,
font: self.options.font,
highlight: self.options.highlight, highlight: self.options.highlight,
'in': self.options['in'], 'in': self.options['in'],
keyboard: index + 1 + '', keyboard: index + 1 + '',
@ -424,15 +419,6 @@ Ox.AnnotationPanel = function(options, self) {
{id: 'text', title: Ox._('By Text'), checked: self.options.sort == 'text'} {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 ? [ self.options.showUsers && self.users.length ? [
{}, {},
{id: 'users', title: Ox._('Show Users'), disabled: true}, {id: 'users', title: Ox._('Show Users'), disabled: true},

2
source/Ox.UI/js/Video/ClipPanel.js
View file

@ -6,7 +6,6 @@ Ox.ClipPanel = function(options, self) {
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
annotationsCalendarSize: 256, annotationsCalendarSize: 256,
annotationsFont: 'small',
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSort: 'position', annotationsSort: 'position',
@ -401,7 +400,6 @@ Ox.ClipPanel = function(options, self) {
calendarSize: self.options.annotationsCalendarSize, calendarSize: self.options.annotationsCalendarSize,
clickLink: self.options.clickLink, clickLink: self.options.clickLink,
editable: false, editable: false,
font: self.options.annotationsFont,
//highlight: self.options.find, //highlight: self.options.find,
//'in': self.options['in'], //'in': self.options['in'],
layers: self.options.layers, layers: self.options.layers,

7
source/Ox.UI/js/Video/VideoAnnotationPanel.js
View file

@ -6,7 +6,6 @@ Ox.VideoAnnotationPanel <f> VideoAnnotationPanel Object
self <o> Shared private variable self <o> Shared private variable
([options[, self]]) -> <o:Ox.SplitPanel> VideoAnnotationPanel Object ([options[, self]]) -> <o:Ox.SplitPanel> VideoAnnotationPanel Object
addannotation <!> addannotation addannotation <!> addannotation
annotationsfont <!> annotationsfont
annotationsrange <!> annotationsrange annotationsrange <!> annotationsrange
annotationssize <!> annotationssize annotationssize <!> annotationssize
annotationssort <!> annotationssort annotationssort <!> annotationssort
@ -46,7 +45,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
annotationsCalendarSize: 256, annotationsCalendarSize: 256,
annotationsFont: 'small',
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSize: 256, annotationsSize: 256,
@ -741,7 +739,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
calendarSize: self.options.annotationsCalendarSize, calendarSize: self.options.annotationsCalendarSize,
clickLink: self.options.clickLink, clickLink: self.options.clickLink,
editable: true, editable: true,
font: self.options.annotationsFont,
highlight: self.options.find, highlight: self.options.find,
'in': self.options['in'], 'in': self.options['in'],
itemName: self.options.itemName, itemName: self.options.itemName,
@ -762,10 +759,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
add: function(data) { add: function(data) {
addAnnotation(data.layer); addAnnotation(data.layer);
}, },
annotationsfont: function(data) {
self.options.annotationsFont = data.font;
that.triggerEvent('annotationsfont', data);
},
annotationsrange: function(data) { annotationsrange: function(data) {
self.options.annotationsRange = data.range; self.options.annotationsRange = data.range;
that.triggerEvent('annotationsrange', data); that.triggerEvent('annotationsrange', data);

2
source/Ox.UI/js/Video/VideoEditPanel.js
View file

@ -6,7 +6,6 @@ Ox.VideoEditPanel = function(options, self) {
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
annotationsCalendarSize: 256, annotationsCalendarSize: 256,
annotationsFont: 'small',
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSort: 'position', annotationsSort: 'position',
@ -327,7 +326,6 @@ Ox.VideoEditPanel = function(options, self) {
self.$clipPanel = Ox.ClipPanel({ self.$clipPanel = Ox.ClipPanel({
annotationsCalendarSize: self.options.annotationsCalendarSize, annotationsCalendarSize: self.options.annotationsCalendarSize,
annotationsFont: self.options.annotationsFont,
annotationsMapSize: self.options.annotationsMapSize, annotationsMapSize: self.options.annotationsMapSize,
annotationsRange: self.options.annotationsRange, annotationsRange: self.options.annotationsRange,
annotationsSort: self.options.annotationsSort, annotationsSort: self.options.annotationsSort,

8
source/Ox.UI/js/Video/VideoPlayerPanel.js
View file

@ -5,7 +5,6 @@ Ox.VideoPlayerPanel <f> VideoPlayerPanel Object
options <o> Options object options <o> Options object
self <o> Shared private variable self <o> Shared private variable
([options[, self]]) -> <o:Ox.SplitPanel> VideoPlayerPanel Object ([options[, self]]) -> <o:Ox.SplitPanel> VideoPlayerPanel Object
annotationsfont <!> annotationsfont
annotationsrange <!> annotationsrange annotationsrange <!> annotationsrange
annotationssize <!> annotationssize annotationssize <!> annotationssize
annotationssort <!> annotationssort annotationssort <!> annotationssort
@ -36,7 +35,6 @@ Ox.VideoPlayerPanel = function(options, self) {
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
annotationsCalendarSize: 256, annotationsCalendarSize: 256,
annotationsFont: 'small',
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSize: 256, annotationsSize: 256,
@ -334,7 +332,6 @@ Ox.VideoPlayerPanel = function(options, self) {
calendarSize: self.options.annotationsCalendarSize, calendarSize: self.options.annotationsCalendarSize,
clickLink: self.options.clickLink, clickLink: self.options.clickLink,
editable: false, editable: false,
font: self.options.annotationsFont,
highlight: self.options.find, highlight: self.options.find,
'in': self.options['in'], 'in': self.options['in'],
itemName: self.options.itemName, itemName: self.options.itemName,
@ -345,7 +342,6 @@ Ox.VideoPlayerPanel = function(options, self) {
range: self.options.annotationsRange, range: self.options.annotationsRange,
selected: self.options.selected, selected: self.options.selected,
showCalendar: self.options.showAnnotationsCalendar, showCalendar: self.options.showAnnotationsCalendar,
showFonts: true,
showLayers: Ox.clone(self.options.showLayers), showLayers: Ox.clone(self.options.showLayers),
showMap: self.options.showAnnotationsMap, showMap: self.options.showAnnotationsMap,
showUsers: self.options.showUsers, showUsers: self.options.showUsers,
@ -353,10 +349,6 @@ Ox.VideoPlayerPanel = function(options, self) {
width: self.options.annotationsSize width: self.options.annotationsSize
}) })
.bindEvent({ .bindEvent({
annotationsfont: function(data) {
self.options.annotationsFont = data.font;
that.triggerEvent('annotationsfont', data);
},
annotationsrange: function(data) { annotationsrange: function(data) {
self.options.annotationsRange = data.range; self.options.annotationsRange = data.range;
that.triggerEvent('annotationsrange', data); that.triggerEvent('annotationsrange', data);

8
source/Ox.UI/js/Video/VideoTimelinePanel.js
View file

@ -6,7 +6,6 @@ Ox.VideoTimelinePanel <f> Video timeline panel
self <o> Shared private variable self <o> Shared private variable
([options[, self]]) -> <o:Ox.SplitPanel> Video timeline panel ([options[, self]]) -> <o:Ox.SplitPanel> Video timeline panel
annoationssize <!> annoationssize annoationssize <!> annoationssize
annotationsfont <!> annotationsfont
annotationsrange <!> annotationsrange annotationsrange <!> annotationsrange
annotationssort <!> annotationssort annotationssort <!> annotationssort
censored <!> censored censored <!> censored
@ -32,7 +31,6 @@ Ox.VideoTimelinePanel = function(options, self) {
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
annotationsCalendarSize: 256, annotationsCalendarSize: 256,
annotationsFont: 'small',
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSize: 256, annotationsSize: 256,
@ -163,7 +161,6 @@ Ox.VideoTimelinePanel = function(options, self) {
calendarSize: self.options.annotationsCalendarSize, calendarSize: self.options.annotationsCalendarSize,
clickLink: self.options.clickLink, clickLink: self.options.clickLink,
editable: false, editable: false,
font: self.options.annotationsFont,
highlight: self.options.find, highlight: self.options.find,
'in': self.options['in'], 'in': self.options['in'],
itemName: self.options.itemName, itemName: self.options.itemName,
@ -174,7 +171,6 @@ Ox.VideoTimelinePanel = function(options, self) {
range: self.options.annotationsRange, range: self.options.annotationsRange,
selected: self.options.selected, selected: self.options.selected,
showCalendar: self.options.showAnnotationsCalendar, showCalendar: self.options.showAnnotationsCalendar,
showFonts: true,
showLayers: Ox.clone(self.options.showLayers), showLayers: Ox.clone(self.options.showLayers),
showMap: self.options.showAnnotationsMap, showMap: self.options.showAnnotationsMap,
showUsers: self.options.showUsers, showUsers: self.options.showUsers,
@ -182,10 +178,6 @@ Ox.VideoTimelinePanel = function(options, self) {
width: self.options.annotationsSize width: self.options.annotationsSize
}) })
.bindEvent({ .bindEvent({
annotationsfont: function(data) {
self.options.annotationsFont = data.font;
that.triggerEvent('annotationsfont', data);
},
annotationsrange: function(data) { annotationsrange: function(data) {
self.options.annotationsRange = data.range; self.options.annotationsRange = data.range;
that.triggerEvent('annotationsrange', data); that.triggerEvent('annotationsrange', data);