From 1fd37f0e62b56f7af4c992e2a44a564341831343 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Fri, 13 Jul 2012 19:56:59 +0200 Subject: [PATCH] Add 'playing' / 'paused' class to player element --- .../javascripts/player/player_view.js.coffee | 20 ++++++--- app/assets/stylesheets/player/player.css.scss | 43 +++++++------------ 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/player/player_view.js.coffee b/app/assets/javascripts/player/player_view.js.coffee index ec55bb7..7a666fa 100644 --- a/app/assets/javascripts/player/player_view.js.coffee +++ b/app/assets/javascripts/player/player_view.js.coffee @@ -4,15 +4,11 @@ class AsciiIo.PlayerView extends Backbone.View initialize: (options) -> @createMainWorker() - @prepareSelfView() @createRendererView() @showLoadingIndicator() @createHudView() if options.hud @fetchModel() - prepareSelfView: -> - @$el.addClass('not-started') - createRendererView: -> @rendererView = new @options.rendererClass( cols: @options.cols @@ -69,12 +65,22 @@ class AsciiIo.PlayerView extends Backbone.View @movie = new AsciiIo.MovieWorkerProxy @worker, 'movie' bindEvents: -> + @movie.on 'started', => @$el.addClass 'playing' + @movie.on 'finished', => @$el.removeClass 'playing' + + @movie.on 'paused', => + @$el.addClass 'paused' + @$el.removeClass 'playing' + @hudView.onPause() if @options.hud + + @movie.on 'resumed', => + @$el.addClass 'playing' + @$el.removeClass 'paused' + @hudView.onResume() if @options.hud + if @options.hud - @movie.on 'paused', => @hudView.onPause() - @movie.on 'resumed', => @hudView.onResume() @movie.on 'time', (time) => @hudView.updateTime(time) - @movie.on 'started', => @$el.removeClass('not-started') @movie.on 'render', (state) => @rendererView.render state @vt.on 'cursor:blink:restart', => @rendererView.restartCursorBlink() diff --git a/app/assets/stylesheets/player/player.css.scss b/app/assets/stylesheets/player/player.css.scss index 3b57ead..01133fc 100644 --- a/app/assets/stylesheets/player/player.css.scss +++ b/app/assets/stylesheets/player/player.css.scss @@ -28,18 +28,6 @@ $color5: #EDC951; margin: 0 auto; position: relative; - &.not-started .hud .toggle { - background-color: $color4; - - .play { - display: inline; - } - - .pause { - display: none; - } - } - .terminal, .font-sample, .hud { @include terminal-font; @@ -128,23 +116,11 @@ $color5: #EDC951; cursor: pointer; .play { - display: none; - } - - .pause { display: inline; } - &.paused { - background-color: $color4; - - .play { - display: inline; - } - - .pause { - display: none; - } + .pause { + display: none; } } @@ -164,6 +140,20 @@ $color5: #EDC951; } } + &.playing { + .hud .toggle { + background-color: $color4; + + .play { + display: none; + } + + .pause { + display: inline; + } + } + } + &:hover .hud { opacity: 1.0; } @@ -180,5 +170,4 @@ $color5: #EDC951; .fg13 { font-weight: bold } .fg14 { font-weight: bold } .fg15 { font-weight: bold } - }