decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

fix #319 (remove annotation font size)

Browse source
This commit is contained in:
rolux 2014-02-18 06:33:24 +00:00
parent 30adf48613
commit c6afcafbdd
11 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pandora/config.0xdb.jsonc
View file

@ -757,7 +757,6 @@
"newsletter": true,
"ui": {
"annotationsCalendarSize": 128,
"annotationsFont": "small",
"annotationsMapSize": 128,
"annotationsRange": "all",
"annotationsSize": 256,

1
pandora/config.indiancinema.jsonc
View file

@ -772,7 +772,6 @@
"newsletter": true,
"ui": {
"annotationsCalendarSize": 128,
"annotationsFont": "small",
"annotationsMapSize": 128,
"annotationsRange": "all",
"annotationsSize": 256,

1
pandora/config.padma.jsonc
View file

@ -648,7 +648,6 @@
"level": "guest",
"ui": {
"annotationsCalendarSize": 128,
"annotationsFont": "small",
"annotationsMapSize": 128,
"annotationsRange": "position",
"annotationsSize": 256,

1
pandora/config.pandora.jsonc
View file

@ -568,7 +568,6 @@
"level": "guest",
"ui": {
"annotationsCalendarSize": 128,
"annotationsFont": "small",
"annotationsMapSize": 128,
"annotationsRange": "all",
"annotationsSize": 256,

1
static/js/editPanel.js
View file

@ -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,

4
static/js/editor.js
View file

@ -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});
},

2
static/js/embedPlayer.js
View file

@ -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,

2
static/js/embedTimeline.js
View file

@ -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,

4
static/js/player.js
View file

@ -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});
},

4
static/js/timeline.js
View file

@ -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});
},

2
static/js/utils.js
View file

@ -1045,7 +1045,7 @@ pandora.getFoldersWidth = function(section) {
pandora.getHash = function(state, callback) {
var embedKeys = [
'annotationsFont', 'annotationsRange', 'annotationsSort',
'annotationsRange', 'annotationsSort',
'embed',
'ignoreRights', 'invertHighlight',
'matchRatio',