From: Philippe Barbosa Date: Thu, 7 Apr 2016 15:28:21 +0000 (+0200) Subject: Javascript for audioplayer X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=85c3064009d2087ec9c2a8bda2bb9055593fb68f;p=mezzo.git Javascript for audioplayer --- diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index fbda0445..f9f81277 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -518,7 +518,7 @@ body { /* line 30, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_defaults.scss */ .clearfix:after, .container:after, .row:after, .sidebar__title--inverse:after, .section__title--inverse:after, -.page__related__title--inverse:after, .row-box:after, .event__card:after, .event__card--alt:after, .event__card--full:after, .calendar__month:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .cta__panel:after, .media:after, .split-container:after, .video__list:after { +.page__related__title--inverse:after, .row-box:after, .event__card:after, .event__card--alt:after, .event__card--full:after, .calendar__month:after, .last__media:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .cta__panel:after, .media:after, .split-container:after, .video__list:after { content: ""; display: table; clear: both; @@ -845,6 +845,19 @@ pre > p { padding-right: 1rem; } +/* line 72, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ +.last__media__entry { + display: block; +} + +/* line 81, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ +.last__media .artist__item, +.last__media .video__card { + float: none; + width: 100%; + padding: 0; +} + /** * Reset default styles */ @@ -2905,26 +2918,27 @@ th { .artist__item { float: left; padding: 0.5rem; + padding-left: 0; } -/* line 26, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 27, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__inner { position: relative; box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.4); } -/* line 38, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 39, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__img { margin: 0; padding: 0; } -/* line 43, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 44, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item img { display: block; } -/* line 47, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 48, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__name { display: block; width: 100%; @@ -2934,7 +2948,7 @@ th { margin: 0; } -/* line 59, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 60, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__name span { display: inline-block; *display: inline; @@ -2946,20 +2960,20 @@ th { font: 700 0.7rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; } -/* line 75, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 76, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__figure { position: relative; padding: 0; margin: 0; } -/* line 79, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 80, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__figure img { display: block; position: relative; } -/* line 84, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ +/* line 85, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__figure__copyright { position: absolute; bottom: 0; @@ -3582,6 +3596,12 @@ th { } } @media (min-width: 769px){ + /* line 72, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ + .last__media__entry{ + float: left; + width: 33.33333%; + padding: 1rem .25rem; + } /* line 137, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form{ width: 100%; @@ -3791,22 +3811,22 @@ th { .artist__item{ padding: 0 0.5rem 1rem; } - /* line 26, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ + /* line 27, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__inner{ transition: .3s; } - /* line 32, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ + /* line 33, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__inner:hover{ box-shadow: 0px 1px 15px 0px rgba(0, 0, 0, 0.8); -webkit-transform: scale(1.01); transform: scale(1.01); } - /* line 47, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ + /* line 48, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__name{ padding: 0.8rem; line-height: 1; } - /* line 59, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ + /* line 60, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */ .artist__item__name span{ font: 700 0.8rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; } diff --git a/app/festival/static/js/index.js b/app/festival/static/js/index.js index ef5fa0ee..f84546e9 100644 --- a/app/festival/static/js/index.js +++ b/app/festival/static/js/index.js @@ -127,7 +127,7 @@ $(function() { $("#instafeed").length && t.run(); /** - * + * Tabs */ var myTabs = tabs({ @@ -138,4 +138,49 @@ $(function() { myTabs.init(); + /** + * Audio player + */ + + function init_player(){ + var audio; + var playlist; + var tracks; + var current; + + current = 0; + audio = $('#audio'); + playlist = $('#playlist'); + tracks = playlist.find('li a'); + len = tracks.length - 1; + audio[0].volume = .90; + // audio[0].play(); + playlist.find('a').click(function(e){ + e.preventDefault(); + link = $(this); + current = link.parent().index(); + run_player(link, audio[0]); + }); + audio[0].addEventListener('ended',function(e){ + current++; + if(current == len){ + current = 0; + link = playlist.find('a')[0]; + }else{ + link = playlist.find('a')[current]; + } + run_player($(link),audio[0]); + }); + } + function run_player(link, player){ + $(player).find('#primarysrc').attr('src', link.attr('href')); + $(player).find('#secondarysrc').attr('src', link.attr('data-altsrc')); + par = link.parent(); + par.addClass('active').siblings().removeClass('active'); + player.load(); + player.play(); + } + + init_player(); + }); \ No newline at end of file diff --git a/app/festival/static/js/player.js b/app/festival/static/js/player.js deleted file mode 100644 index 5eae7bf8..00000000 --- a/app/festival/static/js/player.js +++ /dev/null @@ -1,41 +0,0 @@ - -function init_player(){ - var audio; - var playlist; - var tracks; - var current; - - current = 0; - audio = $('#audio'); - playlist = $('#playlist'); - tracks = playlist.find('li a'); - len = tracks.length - 1; - audio[0].volume = .90; -// audio[0].play(); - playlist.find('a').click(function(e){ - e.preventDefault(); - link = $(this); - current = link.parent().index(); - run_player(link, audio[0]); - }); - audio[0].addEventListener('ended',function(e){ - current++; - if(current == len){ - current = 0; - link = playlist.find('a')[0]; - }else{ - link = playlist.find('a')[current]; - } - run_player($(link),audio[0]); - }); -} -function run_player(link, player){ - $(player).find('#primarysrc').attr('src', link.attr('href')); - $(player).find('#secondarysrc').attr('src', link.attr('data-altsrc')); - par = link.parent(); - par.addClass('active').siblings().removeClass('active'); - player.load(); - player.play(); -} - -init_player();