Skip to content

Controls: video rotation/scale #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions api/video.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var
that,
oldSource,
opacity,
rotation,
isStopped = true,
isLoaded = false,
video = dom.jqPlayerVideo[ 0 ],
Expand Down Expand Up @@ -154,6 +155,25 @@ api.video = that = {
jqVideo.trigger( "opacitychange" );
return that;
},

// Rotation (degrees)
rotation: function( deg ) {
if ( arguments.length === 0 ) {
return rotation;
}
rotation = utils.range( 0, deg, 360, rotation );
jqVideo.trigger( "rotationchange" );
return that;
},

// Getter: width/height
width: function() {
return video.videoWidth;
},
height: function() {
return video.videoHeight;
},

opacityToggle: function( b ) {
if ( typeof b !== "boolean" ) {
b = opacity < 1;
Expand Down
4 changes: 4 additions & 0 deletions dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ window.dom = {
jqPlayerOpacityIcon: $( "#ctrl .opacity > .fa" ),
jqPlayerOpacitySlider: $( "#ctrl .opacity .cuteslider" ),
jqPlayerOpacityValue: $( "#ctrl .opacity .val" ),
// Rotation
jqPlayerRotationIcon: $( "#ctrl .rotation .fa" ),
jqPlayerRotationSlider: $( "#ctrl .rotation .cuteslider" ),
jqPlayerRotationValue: $( "#ctrl .rotation .val" ),
// CurrentTime
jqPlayerSliderCurrentTime: $( "#ctrl .cuteslider.position" ),
// Thumbnail
Expand Down
21 changes: 21 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,26 @@ <h1 class="title">
</span>
</div
><div class="right"
><span class="btn rotation"
><i class="fa fa-repeat"></i
><div
class="menu"
><div class="content"
><div class="header"
><span class="title">Rotation : </span
><b class="val"></b
></div
><ul
><li
><input
type="range"
data-jquery-element="cuteslider"
min="0" max="360" value="0" step="1"
/></li
></ul
></div
></div
></span
><span class="btn visu"
><i class="fa fa-fw fa-align-center fa-rotate-270"></i
><div
Expand Down Expand Up @@ -229,6 +249,7 @@ <h1 class="title">
<script src="player/events/controls.js"></script>
<script src="player/events/subtitles.js"></script>
<script src="player/events/thumbnail.js"></script>
<script src="player/events/rotation.js"></script>
<script src="player/events/position.js"></script>
<script src="player/events/playpausestop.js"></script>
<script src="player/events/volume.js"></script>
Expand Down
1 change: 1 addition & 0 deletions init.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ playerUI.textsShowing = false;
api.video
.resizeUpdate()
.opacity( 1 )
.rotation( 0 )
// Force the volumechange event
.volume( 0 )
.volume( 1 )
Expand Down
8 changes: 7 additions & 1 deletion player/css/controls.css
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@
right: -62px;
}

#ctrl .opacity .menu .cuteslider {
#ctrl .opacity .menu .cuteslider,
#ctrl .rotation .menu .cuteslider {
width: 90px;
height: 14px;
margin: 0 .9em 0 .7em;
Expand All @@ -131,3 +132,8 @@
width: 28px;
height: 13px;
}

#ctrl .rotation .menu {
min-width: 120px;
right: -52px;
}
4 changes: 4 additions & 0 deletions player/data-binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ dom.jqPlayerVideo.on( {
opacitychange: function() {
lg( "ON: opacitychange" );
playerUI.opacity( api.video.opacity() );
},
rotationchange: function() {
lg( "ON: rotationchange" );
playerUI.rotation( api.video.rotation() );
}
});

Expand Down
7 changes: 7 additions & 0 deletions player/events/rotation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(function(){

dom.jqPlayerRotationSlider.change( function() {
api.video.rotation( this.value );
});

})();
9 changes: 9 additions & 0 deletions player/player-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ var
// Button: fullscreen.
jqBtnFScr = dom.jqPlayerFullscreenBtn,

// Button, slider: rotation.
jqRotationIcon = dom.jqPlayerRotationIcon,
jqRotationSlider = dom.jqPlayerRotationSlider,

// Button, slider: opacity.
jqOpacityIcon = dom.jqPlayerOpacityIcon,
jqOpacitySlider = dom.jqPlayerOpacitySlider,
Expand Down Expand Up @@ -158,6 +162,11 @@ window.playerUI = that = {
speed: function( rate ) {
return that.actionDesc( "Speed : " + rate.toFixed( 2 ) + "x" );
},
rotation: function( rot ) {
dom.jqPlayerVideo.css( { transform: "rotate(" + rot + "deg)" } );
dom.jqPlayerRotationValue.text( rot + "°" );
return that;
},
opacity: function( op ) {
dom.jqPlayerScreen.css( "opacity", op );
jqOpacitySlider.element().val( op );
Expand Down
1 change: 1 addition & 0 deletions tools/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ window.utils = {
},
range: function( a, val, b, ori ) {
var valn = +val;

if ( arguments.length === 4 && val[ 1 ] === "=" ) {
valn =
( ori || 0 ) +
Expand Down