From c7b03030bd5bf6e00908971a3080d5c442cabc50 Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 22 Oct 2013 16:45:17 +0200 Subject: [PATCH] rename video panels --- source/Ox.UI/css/Ox.UI.css | 5 ++--- .../Video/{VideoEditor.js => VideoAnnotationPanel.js} | 10 ++++------ .../js/Video/{VideoPanel.js => VideoPlayerPanel.js} | 8 +++----- 3 files changed, 9 insertions(+), 14 deletions(-) rename source/Ox.UI/js/Video/{VideoEditor.js => VideoAnnotationPanel.js} (99%) rename source/Ox.UI/js/Video/{VideoPanel.js => VideoPlayerPanel.js} (99%) diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css index 95cfdf08..008ffda4 100644 --- a/source/Ox.UI/css/Ox.UI.css +++ b/source/Ox.UI/css/Ox.UI.css @@ -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; } diff --git a/source/Ox.UI/js/Video/VideoEditor.js b/source/Ox.UI/js/Video/VideoAnnotationPanel.js similarity index 99% rename from source/Ox.UI/js/Video/VideoEditor.js rename to source/Ox.UI/js/Video/VideoAnnotationPanel.js index cce6a3db..f2e1b663 100644 --- a/source/Ox.UI/js/Video/VideoEditor.js +++ b/source/Ox.UI/js/Video/VideoAnnotationPanel.js @@ -1,10 +1,10 @@ 'use strict'; /*@ -Ox.VideoEditor VideoEditor Object +Ox.VideoAnnotationPanel VideoAnnotationPanel Object options Options object self Shared private variable - ([options[, self]]) -> VideoEditor Object + ([options[, self]]) -> VideoAnnotationPanel Object addannotation addannotation annotationsfont annotationsfont annotationsrange annotationsrange @@ -41,9 +41,7 @@ Ox.VideoEditor 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(); diff --git a/source/Ox.UI/js/Video/VideoPanel.js b/source/Ox.UI/js/Video/VideoPlayerPanel.js similarity index 99% rename from source/Ox.UI/js/Video/VideoPanel.js rename to source/Ox.UI/js/Video/VideoPlayerPanel.js index 09b10495..3127fb53 100644 --- a/source/Ox.UI/js/Video/VideoPanel.js +++ b/source/Ox.UI/js/Video/VideoPlayerPanel.js @@ -1,10 +1,10 @@ 'use strict'; /*@ -Ox.VideoPanel VideoPanel Object +Ox.VideoPlayerPanel VideoPlayerPanel Object options Options object self Shared private variable - ([options[, self]]) -> VideoPanel Object + ([options[, self]]) -> VideoPlayerPanel Object annotationsfont annotationsfont annotationsrange annotationsrange annotationssize annotationssize @@ -30,9 +30,7 @@ Ox.VideoPanel 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)