Permalink
Browse files

fix

  • Loading branch information...
1 parent bc45c6d commit f446a74c48fd541165dac468cfc03016a29bfe6a @Cosmo committed Oct 21, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 app/assets/javascripts/player.js
  2. +4 −4 app/assets/javascripts/ui.js
  3. +1 −1 app/assets/stylesheets/player.css.scss
@@ -38,7 +38,7 @@
$(element).attr("data-name")+
'</span><span class="message">' +
$(element).attr("data-text") +
- '</span></span></div>').appendTo(entries);
+ '</span></span></div>').prependTo(entries);
}
}
@@ -7,11 +7,11 @@ $(document).ready(function(){
$("#infocard").slideUp(400);
$("#video-trigger-minified").css({"background-color" : "#ff4300"});
$("#info-trigger-minified").css({"background-color" : "#222"});
- $("object").get(0).playVideo();
+ // $("object").get(0).playVideo();
} else {
$("#video").animate({"margin-top" : "-323px"}, 300, 'swing');
$("#video-trigger-minified").css({"background-color" : "#222"});
- $("object").get(0).pauseVideo();
+ // $("object").get(0).pauseVideo();
}
});
@@ -20,7 +20,7 @@ $(document).ready(function(){
$("#infocard").slideUp(400);
$("#video-trigger-minified").css({"background-color" : "#ff4300"});
$("#info-trigger-minified").css({"background-color" : "#222"});
- $("object").get(0).playVideo();
+ // $("object").get(0).playVideo();
});
$("#info-trigger-minified").click(function() {
@@ -33,6 +33,6 @@ $(document).ready(function(){
$("#infocard").slideUp('fast');
$("#info-trigger-minified").css({"background-color" : "#222"});
}
- $("object").get(0).pauseVideo();
+ // $("object").get(0).pauseVideo();
});
});
@@ -46,9 +46,9 @@
}
/*
+*/
.controlDiv.play{ background:image-url('ui/play.png') no-repeat center center; }
.controlDiv.pause{ background:image-url('ui/pause.png') no-repeat -99999px; }
-*/
.controlDiv.replay{ background:image-url('ui/replay.png') no-repeat center center; }
.flashContainer:hover .controlDiv.pause{ background-position: center center; }
.flashContainer.playing .progressBar{ display:block; }

0 comments on commit f446a74

Please sign in to comment.