diff --git a/pandora/config.0xdb.jsonc b/pandora/config.0xdb.jsonc index 4e1e7c077..e76d3ce16 100644 --- a/pandora/config.0xdb.jsonc +++ b/pandora/config.0xdb.jsonc @@ -757,7 +757,6 @@ "newsletter": true, "ui": { "annotationsCalendarSize": 128, - "annotationsFont": "small", "annotationsMapSize": 128, "annotationsRange": "all", "annotationsSize": 256, diff --git a/pandora/config.indiancinema.jsonc b/pandora/config.indiancinema.jsonc index 009d22cd5..7d7080b43 100644 --- a/pandora/config.indiancinema.jsonc +++ b/pandora/config.indiancinema.jsonc @@ -772,7 +772,6 @@ "newsletter": true, "ui": { "annotationsCalendarSize": 128, - "annotationsFont": "small", "annotationsMapSize": 128, "annotationsRange": "all", "annotationsSize": 256, diff --git a/pandora/config.padma.jsonc b/pandora/config.padma.jsonc index ea330b9fb..5e6e9d53b 100644 --- a/pandora/config.padma.jsonc +++ b/pandora/config.padma.jsonc @@ -648,7 +648,6 @@ "level": "guest", "ui": { "annotationsCalendarSize": 128, - "annotationsFont": "small", "annotationsMapSize": 128, "annotationsRange": "position", "annotationsSize": 256, diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc index ff9fe29e3..23cda7378 100644 --- a/pandora/config.pandora.jsonc +++ b/pandora/config.pandora.jsonc @@ -568,7 +568,6 @@ "level": "guest", "ui": { "annotationsCalendarSize": 128, - "annotationsFont": "small", "annotationsMapSize": 128, "annotationsRange": "all", "annotationsSize": 256, diff --git a/static/js/editPanel.js b/static/js/editPanel.js index 2dd51a5e2..bf8a9aaf2 100644 --- a/static/js/editPanel.js +++ b/static/js/editPanel.js @@ -75,7 +75,6 @@ pandora.ui.editPanel = function(isEmbed) { } that = pandora.$ui.editPanel = Ox.VideoEditPanel({ annotationsCalendarSize: ui.annotationsCalendarSize, - annotationsFont: ui.annotationsFont, annotationsMapSize: ui.annotationsMapSize, annotationsRange: ui.annotationsRange, annotationsSize: ui.annotationsSize, diff --git a/static/js/editor.js b/static/js/editor.js index 1281e3727..c55b7d5dc 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -8,7 +8,6 @@ pandora.ui.editor = function(data) { that = Ox.VideoAnnotationPanel({ annotationsCalendarSize: ui.annotationsCalendarSize, - annotationsFont: ui.annotationsFont, annotationsMapSize: ui.annotationsMapSize, annotationsRange: ui.annotationsRange, annotationsSize: ui.annotationsSize, @@ -96,9 +95,6 @@ pandora.ui.editor = function(data) { Ox.Request.clearCache(); }); }, - annotationsfont: function(data) { - pandora.UI.set({annotationsFont: data.font}); - }, annotationsrange: function(data) { pandora.UI.set({annotationsRange: data.range}); }, diff --git a/static/js/embedPlayer.js b/static/js/embedPlayer.js index 1f3f0884b..23ae10632 100644 --- a/static/js/embedPlayer.js +++ b/static/js/embedPlayer.js @@ -5,7 +5,6 @@ pandora.ui.embedPlayer = function() { var that = Ox.Element(), ui = pandora.user.ui, defaults = { - annotationsFont: ui.annotationsFont, annotationsRange: ui.annotationsRange, annotationsSort: ui.annotationsSort, invertHighlight: true, @@ -219,7 +218,6 @@ pandora.ui.embedPlayer = function() { } $annotations = Ox.AnnotationPanel(Ox.extend({ clickLink: pandora.clickLink, - font: options.annotationsFont, layers: video.annotations, position: options.position, range: options.annotationsRange, diff --git a/static/js/embedTimeline.js b/static/js/embedTimeline.js index cb6d15836..ac7467b68 100644 --- a/static/js/embedTimeline.js +++ b/static/js/embedTimeline.js @@ -5,7 +5,6 @@ pandora.ui.embedTimeline = function() { var that = Ox.Element(), ui = pandora.user.ui, defaults = { - annotationsFont: ui.annotationsFont, annotationsRange: ui.annotationsRange, annotationsSort: ui.annotationsSort, paused: true, @@ -104,7 +103,6 @@ pandora.ui.embedTimeline = function() { } $annotations = Ox.AnnotationPanel(Ox.extend({ clickLink: pandora.clickLink, - font: options.annotationsFont, layers: video.annotations, position: options.position, range: options.annotationsRange, diff --git a/static/js/player.js b/static/js/player.js index 7a4bdba87..7630dccce 100644 --- a/static/js/player.js +++ b/static/js/player.js @@ -8,7 +8,6 @@ pandora.ui.player = function(data) { that = Ox.VideoPlayerPanel({ annotationsCalendarSize: ui.annotationsCalendarSize, - annotationsFont: ui.annotationsFont, annotationsMapSize: ui.annotationsMapSize, annotationsRange: ui.annotationsRange, annotationsSize: ui.annotationsSize, @@ -56,9 +55,6 @@ pandora.ui.player = function(data) { volume: ui.videoVolume, width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1 }).bindEvent({ - annotationsfont: function(data) { - pandora.UI.set({annotationsFont: data.font}); - }, annotationsrange: function(data) { pandora.UI.set({annotationsRange: data.range}); }, diff --git a/static/js/timeline.js b/static/js/timeline.js index 6983380ff..ebe38b9c8 100644 --- a/static/js/timeline.js +++ b/static/js/timeline.js @@ -8,7 +8,6 @@ pandora.ui.timeline = function(data) { that = Ox.VideoTimelinePanel({ annotationsCalendarSize: ui.annotationsCalendarSize, - annotationsFont: ui.annotationsFont, annotationsMapSize: ui.annotationsMapSize, annotationsRange: ui.annotationsRange, annotationsSize: ui.annotationsSize, @@ -57,9 +56,6 @@ pandora.ui.timeline = function(data) { width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1 }) .bindEvent({ - annotationsfont: function(data) { - pandora.UI.set({annotationsFont: data.font}); - }, annotationsrange: function(data) { pandora.UI.set({annotationsRange: data.range}); }, diff --git a/static/js/utils.js b/static/js/utils.js index f162efe6c..a8c12836c 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -1045,7 +1045,7 @@ pandora.getFoldersWidth = function(section) { pandora.getHash = function(state, callback) { var embedKeys = [ - 'annotationsFont', 'annotationsRange', 'annotationsSort', + 'annotationsRange', 'annotationsSort', 'embed', 'ignoreRights', 'invertHighlight', 'matchRatio',