forked from 0x2620/pandora
fix #319 (remove annotation font size)
This commit is contained in:
parent
30adf48613
commit
c6afcafbdd
11 changed files with 1 additions and 22 deletions
|
@ -757,7 +757,6 @@
|
||||||
"newsletter": true,
|
"newsletter": true,
|
||||||
"ui": {
|
"ui": {
|
||||||
"annotationsCalendarSize": 128,
|
"annotationsCalendarSize": 128,
|
||||||
"annotationsFont": "small",
|
|
||||||
"annotationsMapSize": 128,
|
"annotationsMapSize": 128,
|
||||||
"annotationsRange": "all",
|
"annotationsRange": "all",
|
||||||
"annotationsSize": 256,
|
"annotationsSize": 256,
|
||||||
|
|
|
@ -772,7 +772,6 @@
|
||||||
"newsletter": true,
|
"newsletter": true,
|
||||||
"ui": {
|
"ui": {
|
||||||
"annotationsCalendarSize": 128,
|
"annotationsCalendarSize": 128,
|
||||||
"annotationsFont": "small",
|
|
||||||
"annotationsMapSize": 128,
|
"annotationsMapSize": 128,
|
||||||
"annotationsRange": "all",
|
"annotationsRange": "all",
|
||||||
"annotationsSize": 256,
|
"annotationsSize": 256,
|
||||||
|
|
|
@ -648,7 +648,6 @@
|
||||||
"level": "guest",
|
"level": "guest",
|
||||||
"ui": {
|
"ui": {
|
||||||
"annotationsCalendarSize": 128,
|
"annotationsCalendarSize": 128,
|
||||||
"annotationsFont": "small",
|
|
||||||
"annotationsMapSize": 128,
|
"annotationsMapSize": 128,
|
||||||
"annotationsRange": "position",
|
"annotationsRange": "position",
|
||||||
"annotationsSize": 256,
|
"annotationsSize": 256,
|
||||||
|
|
|
@ -568,7 +568,6 @@
|
||||||
"level": "guest",
|
"level": "guest",
|
||||||
"ui": {
|
"ui": {
|
||||||
"annotationsCalendarSize": 128,
|
"annotationsCalendarSize": 128,
|
||||||
"annotationsFont": "small",
|
|
||||||
"annotationsMapSize": 128,
|
"annotationsMapSize": 128,
|
||||||
"annotationsRange": "all",
|
"annotationsRange": "all",
|
||||||
"annotationsSize": 256,
|
"annotationsSize": 256,
|
||||||
|
|
|
@ -75,7 +75,6 @@ pandora.ui.editPanel = function(isEmbed) {
|
||||||
}
|
}
|
||||||
that = pandora.$ui.editPanel = Ox.VideoEditPanel({
|
that = pandora.$ui.editPanel = Ox.VideoEditPanel({
|
||||||
annotationsCalendarSize: ui.annotationsCalendarSize,
|
annotationsCalendarSize: ui.annotationsCalendarSize,
|
||||||
annotationsFont: ui.annotationsFont,
|
|
||||||
annotationsMapSize: ui.annotationsMapSize,
|
annotationsMapSize: ui.annotationsMapSize,
|
||||||
annotationsRange: ui.annotationsRange,
|
annotationsRange: ui.annotationsRange,
|
||||||
annotationsSize: ui.annotationsSize,
|
annotationsSize: ui.annotationsSize,
|
||||||
|
|
|
@ -8,7 +8,6 @@ pandora.ui.editor = function(data) {
|
||||||
|
|
||||||
that = Ox.VideoAnnotationPanel({
|
that = Ox.VideoAnnotationPanel({
|
||||||
annotationsCalendarSize: ui.annotationsCalendarSize,
|
annotationsCalendarSize: ui.annotationsCalendarSize,
|
||||||
annotationsFont: ui.annotationsFont,
|
|
||||||
annotationsMapSize: ui.annotationsMapSize,
|
annotationsMapSize: ui.annotationsMapSize,
|
||||||
annotationsRange: ui.annotationsRange,
|
annotationsRange: ui.annotationsRange,
|
||||||
annotationsSize: ui.annotationsSize,
|
annotationsSize: ui.annotationsSize,
|
||||||
|
@ -96,9 +95,6 @@ pandora.ui.editor = function(data) {
|
||||||
Ox.Request.clearCache();
|
Ox.Request.clearCache();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
annotationsfont: function(data) {
|
|
||||||
pandora.UI.set({annotationsFont: data.font});
|
|
||||||
},
|
|
||||||
annotationsrange: function(data) {
|
annotationsrange: function(data) {
|
||||||
pandora.UI.set({annotationsRange: data.range});
|
pandora.UI.set({annotationsRange: data.range});
|
||||||
},
|
},
|
||||||
|
|
|
@ -5,7 +5,6 @@ pandora.ui.embedPlayer = function() {
|
||||||
var that = Ox.Element(),
|
var that = Ox.Element(),
|
||||||
ui = pandora.user.ui,
|
ui = pandora.user.ui,
|
||||||
defaults = {
|
defaults = {
|
||||||
annotationsFont: ui.annotationsFont,
|
|
||||||
annotationsRange: ui.annotationsRange,
|
annotationsRange: ui.annotationsRange,
|
||||||
annotationsSort: ui.annotationsSort,
|
annotationsSort: ui.annotationsSort,
|
||||||
invertHighlight: true,
|
invertHighlight: true,
|
||||||
|
@ -219,7 +218,6 @@ pandora.ui.embedPlayer = function() {
|
||||||
}
|
}
|
||||||
$annotations = Ox.AnnotationPanel(Ox.extend({
|
$annotations = Ox.AnnotationPanel(Ox.extend({
|
||||||
clickLink: pandora.clickLink,
|
clickLink: pandora.clickLink,
|
||||||
font: options.annotationsFont,
|
|
||||||
layers: video.annotations,
|
layers: video.annotations,
|
||||||
position: options.position,
|
position: options.position,
|
||||||
range: options.annotationsRange,
|
range: options.annotationsRange,
|
||||||
|
|
|
@ -5,7 +5,6 @@ pandora.ui.embedTimeline = function() {
|
||||||
var that = Ox.Element(),
|
var that = Ox.Element(),
|
||||||
ui = pandora.user.ui,
|
ui = pandora.user.ui,
|
||||||
defaults = {
|
defaults = {
|
||||||
annotationsFont: ui.annotationsFont,
|
|
||||||
annotationsRange: ui.annotationsRange,
|
annotationsRange: ui.annotationsRange,
|
||||||
annotationsSort: ui.annotationsSort,
|
annotationsSort: ui.annotationsSort,
|
||||||
paused: true,
|
paused: true,
|
||||||
|
@ -104,7 +103,6 @@ pandora.ui.embedTimeline = function() {
|
||||||
}
|
}
|
||||||
$annotations = Ox.AnnotationPanel(Ox.extend({
|
$annotations = Ox.AnnotationPanel(Ox.extend({
|
||||||
clickLink: pandora.clickLink,
|
clickLink: pandora.clickLink,
|
||||||
font: options.annotationsFont,
|
|
||||||
layers: video.annotations,
|
layers: video.annotations,
|
||||||
position: options.position,
|
position: options.position,
|
||||||
range: options.annotationsRange,
|
range: options.annotationsRange,
|
||||||
|
|
|
@ -8,7 +8,6 @@ pandora.ui.player = function(data) {
|
||||||
|
|
||||||
that = Ox.VideoPlayerPanel({
|
that = Ox.VideoPlayerPanel({
|
||||||
annotationsCalendarSize: ui.annotationsCalendarSize,
|
annotationsCalendarSize: ui.annotationsCalendarSize,
|
||||||
annotationsFont: ui.annotationsFont,
|
|
||||||
annotationsMapSize: ui.annotationsMapSize,
|
annotationsMapSize: ui.annotationsMapSize,
|
||||||
annotationsRange: ui.annotationsRange,
|
annotationsRange: ui.annotationsRange,
|
||||||
annotationsSize: ui.annotationsSize,
|
annotationsSize: ui.annotationsSize,
|
||||||
|
@ -56,9 +55,6 @@ pandora.ui.player = function(data) {
|
||||||
volume: ui.videoVolume,
|
volume: ui.videoVolume,
|
||||||
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
|
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
|
||||||
}).bindEvent({
|
}).bindEvent({
|
||||||
annotationsfont: function(data) {
|
|
||||||
pandora.UI.set({annotationsFont: data.font});
|
|
||||||
},
|
|
||||||
annotationsrange: function(data) {
|
annotationsrange: function(data) {
|
||||||
pandora.UI.set({annotationsRange: data.range});
|
pandora.UI.set({annotationsRange: data.range});
|
||||||
},
|
},
|
||||||
|
|
|
@ -8,7 +8,6 @@ pandora.ui.timeline = function(data) {
|
||||||
|
|
||||||
that = Ox.VideoTimelinePanel({
|
that = Ox.VideoTimelinePanel({
|
||||||
annotationsCalendarSize: ui.annotationsCalendarSize,
|
annotationsCalendarSize: ui.annotationsCalendarSize,
|
||||||
annotationsFont: ui.annotationsFont,
|
|
||||||
annotationsMapSize: ui.annotationsMapSize,
|
annotationsMapSize: ui.annotationsMapSize,
|
||||||
annotationsRange: ui.annotationsRange,
|
annotationsRange: ui.annotationsRange,
|
||||||
annotationsSize: ui.annotationsSize,
|
annotationsSize: ui.annotationsSize,
|
||||||
|
@ -57,9 +56,6 @@ pandora.ui.timeline = function(data) {
|
||||||
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
|
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
|
||||||
})
|
})
|
||||||
.bindEvent({
|
.bindEvent({
|
||||||
annotationsfont: function(data) {
|
|
||||||
pandora.UI.set({annotationsFont: data.font});
|
|
||||||
},
|
|
||||||
annotationsrange: function(data) {
|
annotationsrange: function(data) {
|
||||||
pandora.UI.set({annotationsRange: data.range});
|
pandora.UI.set({annotationsRange: data.range});
|
||||||
},
|
},
|
||||||
|
|
|
@ -1045,7 +1045,7 @@ pandora.getFoldersWidth = function(section) {
|
||||||
|
|
||||||
pandora.getHash = function(state, callback) {
|
pandora.getHash = function(state, callback) {
|
||||||
var embedKeys = [
|
var embedKeys = [
|
||||||
'annotationsFont', 'annotationsRange', 'annotationsSort',
|
'annotationsRange', 'annotationsSort',
|
||||||
'embed',
|
'embed',
|
||||||
'ignoreRights', 'invertHighlight',
|
'ignoreRights', 'invertHighlight',
|
||||||
'matchRatio',
|
'matchRatio',
|
||||||
|
|
Loading…
Reference in a new issue