0x2620/oxjs
2
0
Fork 2
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
commit c7b03030bd
3 changed files with 9 additions and 14 deletions
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); background: rgba(0, 0, 0, 0.5);
} }
.OxVideoEditor { .OxVideoAnnotationPanel {
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }
.OxVideoEditor .OxVideoPlayer { .OxVideoAnnotationPanel .OxVideoPlayer {
position: absolute; position: absolute;
margin: 4px; 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'; 'use strict';
/*@ /*@
Ox.VideoEditor <f> VideoEditor Object Ox.VideoAnnotationPanel <f> VideoAnnotationPanel Object
options <o> Options object options <o> Options object
self <o> Shared private variable self <o> Shared private variable
([options[, self]]) -> <o:Ox.SplitPanel> VideoEditor Object ([options[, self]]) -> <o:Ox.SplitPanel> VideoAnnotationPanel Object
addannotation <!> addannotation addannotation <!> addannotation
annotationsfont <!> annotationsfont annotationsfont <!> annotationsfont
annotationsrange <!> annotationsrange annotationsrange <!> annotationsrange
@ -41,9 +41,7 @@ Ox.VideoEditor <f> VideoEditor Object
volume <!> volume volume <!> volume
@*/ @*/
// fixme: should be VideoAnnotationEditor Ox.VideoAnnotationPanel = function(options, self) {
Ox.VideoEditor = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
@ -294,7 +292,7 @@ Ox.VideoEditor = function(options, self) {
self.words = getWords(); self.words = getWords();
self.$editor = Ox.Element() self.$editor = Ox.Element()
.addClass('OxVideoEditor OxMedia') .addClass('OxVideoAnnotationPanel OxMedia')
.mousedown(function(e) { .mousedown(function(e) {
var $target = $(e.target); var $target = $(e.target);
!$target.is('.OxPosition') && !$target.is('input') && that.gainFocus(); !$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'; 'use strict';
/*@ /*@
Ox.VideoPanel <f> VideoPanel Object 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> VideoPanel Object ([options[, self]]) -> <o:Ox.SplitPanel> VideoPlayerPanel Object
annotationsfont <!> annotationsfont annotationsfont <!> annotationsfont
annotationsrange <!> annotationsrange annotationsrange <!> annotationsrange
annotationssize <!> annotationssize annotationssize <!> annotationssize
@ -30,9 +30,7 @@ Ox.VideoPanel <f> VideoPanel Object
volume <!> volume volume <!> volume
@*/ @*/
// fixme: should be VideoPlayerPanel Ox.VideoPlayerPanel = function(options, self) {
Ox.VideoPanel = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element({}, self) var that = Ox.Element({}, self)