Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add a progress bar to the video controller track #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add a progress bar to the video controller track #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 19 additions & 13 deletions ui/video-control.reel/video-control-track.reel/video-control-track.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,19 @@
/* em value needs to be sorted out when the font size is more stable*/
margin: 0px .8em;
border-radius: 10px;
background-color: hsla(0,0%,100%,.2);

-webkit-transition: -webkit-transform .1s;
-moz-transition: -moz-transform .1s;
-ms-transition: -ms-transform .1s;
transition: transform .1s;
}

.digit-VideoControlTrack-timeline-progress {
background-color: hsla(0,0%,85%,.8);
position: absolute;
height: inherit;
border-radius: inherit;
-webkit-transform: translateX(-67%);
-moz-transform: translateX(-67%);
-ms-transform: translateX(-67%);
transform: translateX(-67%);
width: 100%;
display: flex;
flex: 1;
border: 0;
}


.digit-VideoControlTrack-thumb {
position: absolute;
box-sizing: border-box;
Expand Down Expand Up @@ -142,12 +137,23 @@

/* Light ------------------------------------ */

[data-montage-skin="light"] .digit-VideoControlTrack-timeline {
[data-montage-skin="light"] .digit-VideoControlTrack-timeline-progress {
background-color: hsla(0,0%,0%,.1);
box-shadow: inset 0 1px 1px hsla(0,0%,0%,.15), 0 1px 0 hsla(0,0%,100%,.5);

color: hsla(0,0%,0%,.5); /*progress bar value IE*/
}

[data-montage-skin="light"] .digit-VideoControlTrack-timeline-progress {
[data-montage-skin="light"] .digit-VideoControlTrack-timeline-progress::-webkit-progress-bar {
background-color: hsla(0,0%,0%,.1);
box-shadow: inset 0 1px 1px hsla(0,0%,0%,.15), 0 1px 0 hsla(0,0%,100%,.5);
}

[data-montage-skin="light"] .digit-VideoControlTrack-timeline-progress::-moz-progress-bar {
background-color: hsla(0,0%,0%,.5);
}

[data-montage-skin="light"] .digit-VideoControlTrack-timeline-progress::-webkit-progress-value {
background-color: hsla(0,0%,0%,.5);
}

Expand Down
12 changes: 11 additions & 1 deletion ui/video-control.reel/video-control-track.reel/video-control-track.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,24 @@
"bindings": {
"value": {"<-": "@owner.formattedTime"}
}
},
"progressBar": {
"prototype": "ui/video-control.reel/video-control-track.reel[ProgressBar]",
"properties": {
"element": {"#": "progress-bar"}
},
"bindings": {
"max": {"<-": "@owner.videoController.duration"},
"value": {"<-": "@owner.videoController.position"}
}
}
}
</script>
</head>
<body>
<div data-montage-id="video-control-track" class="digit-VideoControlTrack">
<div class="digit-VideoControlTrack-timeline">
<!--<div class="digit-VideoControlTrack-timeline-progress"></div>-->
<progress data-montage-id="progress-bar" class="digit-VideoControlTrack-timeline-progress"></progress>
</div>
<div data-montage-id="sliderThumbTrack" class="digit-VideoControlTrack-thumbTrack">
<div data-montage-id="sliderThumb" class="digit-VideoControlTrack-thumb">-2:45</div>
Expand Down
7 changes: 6 additions & 1 deletion ui/video-control.reel/video-control-track.reel/video-control-track.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
var Montage = require("montage").Montage;
var AbstractSlider = require("montage/ui/base/abstract-slider").AbstractSlider;
var AbstractProgressBar = require("montage/ui/base/abstract-progress-bar").AbstractProgressBar;
var Promise = require("montage/core/promise").Promise;

/**
Expand Down Expand Up @@ -50,7 +51,6 @@ exports.VideoControlTrack = Montage.create(AbstractSlider, /** @lends VideoContr
handleThumbTranslate: {
value: function (event) {
AbstractSlider.handleThumbTranslate.apply(this, arguments);

}
},

Expand Down Expand Up @@ -116,3 +116,8 @@ exports.VideoControlTrack = Montage.create(AbstractSlider, /** @lends VideoContr
}

});


exports.ProgressBar = Montage.create(AbstractProgressBar, {
hasTemplate: {value: false}
});