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

add enableMouse option to VideoPlayer

Browse source
This commit is contained in:
rlx 2011-08-18 14:03:48 +00:00
parent 3203556b46
commit 9d0dee01e8
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1008,7 +1008,8 @@ Lists
overflow: hidden; overflow: hidden;
} }
.OxIconList .OxItem > .OxIcon > img { .OxIconList .OxItem > .OxIcon > img,
.OxIconList .OxItem > .OxIcon > .OxVideoPlayer {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
@ -1018,6 +1019,7 @@ Lists
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
} }
.OxIconList .OxItem > .OxReflection { .OxIconList .OxItem > .OxReflection {
overflow: hidden; overflow: hidden;
} }

1
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -170,6 +170,7 @@ Ox.VideoEditor = function(options, self) {
['play', 'playInToOut', 'volume', 'size', 'space', 'position'] : ['play', 'playInToOut', 'volume', 'size', 'space', 'position'] :
['goto', 'set', 'space', 'position'], ['goto', 'set', 'space', 'position'],
duration: self.options.duration, duration: self.options.duration,
enableMouse: true,
externalControls: true, externalControls: true,
find: self.options.find, find: self.options.find,
height: self.sizes.player[i].height, height: self.sizes.player[i].height,

1
source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
View file

@ -69,6 +69,7 @@ Ox.VideoPanelPlayer = function(options, self) {
controlsBottom: ['play', 'volume', 'timeline', 'position', 'resolution'], controlsBottom: ['play', 'volume', 'timeline', 'position', 'resolution'],
enableFind: true, enableFind: true,
enableKeyboard: true, enableKeyboard: true,
enableMouse: true,
height: getPlayerHeight(), height: getPlayerHeight(),
muted: self.options.muted, muted: self.options.muted,
paused: true, paused: true,

5
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -20,6 +20,7 @@ Ox.VideoPlayer <f> Generic Video Player
enableFind <b|false> If true, enable find enableFind <b|false> If true, enable find
enableFullscreen <b|false> If true, enable fullscreen enableFullscreen <b|false> If true, enable fullscreen
enableKeyboard <b|false> If true, enable keyboard controls enableKeyboard <b|false> If true, enable keyboard controls
enableMouse <b|false> If true, click toggles paused
externalControls <b|false> If true, controls are outside the video externalControls <b|false> If true, controls are outside the video
find <s|''> Query string find <s|''> Query string
focus <s|'click'> focus on 'click', 'load' or 'mouseover' focus <s|'click'> focus on 'click', 'load' or 'mouseover'
@ -257,7 +258,7 @@ Ox.VideoPlayer = function(options, self) {
if (self.options.type == 'play') { if (self.options.type == 'play') {
self.$videoContainer.bind({ self.options.enableMouse && self.$videoContainer.bind({
click: function(e) { click: function(e) {
if (!$(e.target).is('.OxLogo')) { if (!$(e.target).is('.OxLogo')) {
togglePaused(); togglePaused();
@ -291,7 +292,7 @@ Ox.VideoPlayer = function(options, self) {
} else { } else {
self.$videoContainer.bind({ self.options.enableMouse && self.$videoContainer.bind({
click: function(e) { click: function(e) {
if (!$(e.target).is('.OxLogo')) { if (!$(e.target).is('.OxLogo')) {
goToPoint(); goToPoint();

8
source/Ox.UI/themes/modern/css/modern.css
View file

@ -233,17 +233,19 @@ Lists
================================================================================ ================================================================================
*/ */
.OxThemeModern .OxIconList .OxItem img.OxLoading { .OxThemeModern .OxIconList .OxItem > img.OxLoading {
border-color: rgb(48, 48, 48); border-color: rgb(48, 48, 48);
background: -moz-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0)); background: -moz-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0));
background: -webkit-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0)); background: -webkit-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0));
} }
.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon img { .OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > img,
.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
border-color: rgb(96, 96, 96); border-color: rgb(96, 96, 96);
-moz-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -moz-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
-webkit-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -webkit-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
} }
.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon img { .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img,
.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon .OxVideoPlayer {
border-color: rgb(128, 128, 128); border-color: rgb(128, 128, 128);
-moz-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -moz-box-shadow: 0 0 4px rgba(128, 128, 128, 1);
-webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1);