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

rename video panels

Browse source
This commit is contained in:
rolux 2013-10-22 16:45:17 +02:00
parent 24e6330265
commit c7b03030bd
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/Ox.UI/css/Ox.UI.css
View file

@ -2218,14 +2218,13 @@ Video
background: rgba(0, 0, 0, 0.5);
}
.OxVideoEditor {
.OxVideoAnnotationPanel {
overflow-x: hidden;
overflow-y: auto;
}
.OxVideoEditor .OxVideoPlayer {
.OxVideoAnnotationPanel .OxVideoPlayer {
position: absolute;
margin: 4px;
//background: red;
}

10
source/Ox.UI/js/Video/VideoEditor.js → source/Ox.UI/js/Video/VideoAnnotationPanel.js
View file

@ -1,10 +1,10 @@
'use strict';
/*@
Ox.VideoEditor <f> VideoEditor Object
Ox.VideoAnnotationPanel <f> VideoAnnotationPanel Object
options <o> Options object
self <o> Shared private variable
([options[, self]]) -> <o:Ox.SplitPanel> VideoEditor Object
([options[, self]]) -> <o:Ox.SplitPanel> VideoAnnotationPanel Object
addannotation <!> addannotation
annotationsfont <!> annotationsfont
annotationsrange <!> annotationsrange
@ -41,9 +41,7 @@ Ox.VideoEditor <f> VideoEditor Object
volume <!> volume
@*/
// fixme: should be VideoAnnotationEditor
Ox.VideoEditor = function(options, self) {
Ox.VideoAnnotationPanel = function(options, self) {
self = self || {};
var that = Ox.Element({}, self)
.defaults({
@ -294,7 +292,7 @@ Ox.VideoEditor = function(options, self) {
self.words = getWords();
self.$editor = Ox.Element()
.addClass('OxVideoEditor OxMedia')
.addClass('OxVideoAnnotationPanel OxMedia')
.mousedown(function(e) {
var $target = $(e.target);
!$target.is('.OxPosition') && !$target.is('input') && that.gainFocus();

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

@ -1,10 +1,10 @@
'use strict';
/*@
Ox.VideoPanel <f> VideoPanel Object
Ox.VideoPlayerPanel <f> VideoPlayerPanel Object
options <o> Options object
self <o> Shared private variable
([options[, self]]) -> <o:Ox.SplitPanel> VideoPanel Object
([options[, self]]) -> <o:Ox.SplitPanel> VideoPlayerPanel Object
annotationsfont <!> annotationsfont
annotationsrange <!> annotationsrange
annotationssize <!> annotationssize
@ -30,9 +30,7 @@ Ox.VideoPanel <f> VideoPanel Object
volume <!> volume
@*/
// fixme: should be VideoPlayerPanel
Ox.VideoPanel = function(options, self) {
Ox.VideoPlayerPanel = function(options, self) {
self = self || {};
var that = Ox.Element({}, self)