Skip to content

Commit

Permalink
Move to public/system/images for generation and storage of signs
Browse files Browse the repository at this point in the history
Former-commit-id: 7f3a62ada6fb26ef545a1dd173462e9242a2b665
  • Loading branch information
Mathew Hartley committed Jan 7, 2014
1 parent 64302c1 commit 46bf5ea
Show file tree
Hide file tree
Showing 6 changed files with 241 additions and 10 deletions.
Binary file modified .DS_Store
Binary file not shown.
8 changes: 3 additions & 5 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//= require jquery
//= require jquery_ujs
//= require jquery-ui
//= require dd_belatedpng
//= require flowplayer-5.4.6
//= require_self

Expand Down Expand Up @@ -91,7 +90,6 @@ $(function(){
key: '#$c1ee98f7e52a995b8d9',
clip: {
onFail: function(a,b,c){
debugger;
},
autoPlay: false,
autoBuffering: true,
Expand Down Expand Up @@ -129,9 +127,9 @@ $(function(){
};
var flowplayer_hidden_config = $.extend(true, {}, flowplayer_config)
flowplayer_hidden_config.clip.autoBuffering = false;
$f('.video_replace_hidden_flash', {src: '/flowplayer.commercial-3.2.7.swf' , wmode: 'transparent'}, flowplayer_hidden_config); //.each(function(){this.ipad()});
$f('.video_replace_flash', {src: '/flowplayer.commercial-3.2.7.swf' , wmode: 'transparent'}, flowplayer_config); //.each(function(){this.ipad()});
$('.video_replace').attr('href', 'javascript:void(0);');
// $f('.video_replace_hidden_flash', {src: '/flowplayer.commercial-3.2.7.swf' , wmode: 'transparent'}, flowplayer_hidden_config); //.each(function(){this.ipad()});
// $f('.video_replace_flash', {src: '/flowplayer.commercial-3.2.7.swf' , wmode: 'transparent'}, flowplayer_config); //.each(function(){this.ipad()});
// $('.video_replace').attr('href', 'javascript:void(0);');
}
var setup_slow_motion_videos = function(){
$('.button.normal, .button.slow, .button.translation_button').click(function(){
Expand Down
Loading

0 comments on commit 46bf5ea

Please sign in to comment.