Permalink
Browse files

made build

  • Loading branch information...
1 parent 11cc6f0 commit ac45c879767003c327936d12e9333a4e4da146f8 @ericmatthys ericmatthys committed May 12, 2012
Showing with 2 additions and 24 deletions.
  1. +0 −20 app/css/plex.css
  2. +1 −0 app/js/build.js
  3. +1 −1 app/js/plex/view/players/core/SeekBarView.js
  4. +0 −3 app/less/player.less
View
@@ -9006,16 +9006,6 @@ video.player-fullscreen {
background: -o-linear-gradient(top, #2e7ac7 0%, #2970b8 50%, #225e9b 51%, #2465a8 100%);
background: -ms-linear-gradient(top, #2e7ac7 0%, #2970b8 50%, #225e9b 51%, #2465a8 100%);
background: linear-gradient(top, #2e7ac7 0%, #2970b8 50%, #225e9b 51%, #2465a8 100%);
- -webkit-transition: width 0.1s ease-in-out;
- -moz-transition: width 0.1s ease-in-out;
- -ms-transition: width 0.1s ease-in-out;
- -o-transition: width 0.1s ease-in-out;
- transition: width 0.1s ease-in-out;
- -webkit-transition: width 0.1s ease-in-out;
- -moz-transition: width 0.1s ease-in-out;
- -ms-transition: width 0.1s ease-in-out;
- -o-transition: width 0.1s ease-in-out;
- transition: width 0.1s ease-in-out;
}
.player-progress-bar {
position: absolute;
@@ -9078,16 +9068,6 @@ video.player-fullscreen {
background-image: -ms-radial-gradient(circle, #dddddd, #aaaaaa);
background-image: -o-radial-gradient(circle, #dddddd, #aaaaaa);
background-repeat: no-repeat;
- -webkit-transition: left 0.1s ease-in-out;
- -moz-transition: left 0.1s ease-in-out;
- -ms-transition: left 0.1s ease-in-out;
- -o-transition: left 0.1s ease-in-out;
- transition: left 0.1s ease-in-out;
- -webkit-transition: left 0.1s ease-in-out;
- -moz-transition: left 0.1s ease-in-out;
- -ms-transition: left 0.1s ease-in-out;
- -o-transition: left 0.1s ease-in-out;
- transition: left 0.1s ease-in-out;
}
.player-active-slider .player-slider-thumb,
.player-seek-bar:hover .player-progress-thumb,
View
@@ -19,6 +19,7 @@
'base64': 'libs/base64',
'sha256': 'libs/jssha256-0.1',
'mediaelement': 'libs/mediaelement-2.8.1',
+ 'soundmanager': 'libs/soundmanager2',
// Externals
'templates': '../templates',
@@ -42,7 +42,7 @@ define(
initialize: function (options) {
_.bindAll(this, 'onSeekBarMouseMove', 'onSeekBarMouseUp');
- this.model.bind('change:formattedTime', this.onCurrentTimeChange, this);
+ this.model.bind('change:currentTime', this.onCurrentTimeChange, this);
this.model.bind('change:startBuffer', this.onBufferChange, this);
this.model.bind('change:endBuffer', this.onBufferChange, this);
},
@@ -227,8 +227,6 @@ video.player-fullscreen {
background: -o-linear-gradient(top, #2e7ac7 0%,#2970b8 50%,#225e9b 51%,#2465a8 100%);
background: -ms-linear-gradient(top, #2e7ac7 0%,#2970b8 50%,#225e9b 51%,#2465a8 100%);
background: linear-gradient(top, #2e7ac7 0%,#2970b8 50%,#225e9b 51%,#2465a8 100%);
-
- .transition(width .1s ease-in-out);
}
.player-progress-bar {
@@ -279,7 +277,6 @@ video.player-fullscreen {
z-index: 3;
.border-radius(4px);
#gradient > .radial(#ddd, #aaa);
- .transition(left .1s ease-in-out);
}
.player-active-slider .player-slider-thumb,

0 comments on commit ac45c87

Please sign in to comment.