From 04b7376cbd269cb010ffd3f43c5dc060ddcaf3f2 Mon Sep 17 00:00:00 2001 From: gballan1 Date: Mon, 28 Nov 2016 11:17:28 -0500 Subject: [PATCH] Started working on the music player --- app/views/music1.twig | 1 - app/views/music2.twig | 1 - app/views/templates/default.twig | 34 +++++++++++++++++--------------- public/js/music.js | 31 +++++++++++++++++++++++------ 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/app/views/music1.twig b/app/views/music1.twig index d9fea54..ca826be 100644 --- a/app/views/music1.twig +++ b/app/views/music1.twig @@ -1,7 +1,6 @@ {% extends 'templates/default.twig' %} {% block javascripts %} - {% endblock %} diff --git a/app/views/music2.twig b/app/views/music2.twig index 52b6eb2..3630acd 100644 --- a/app/views/music2.twig +++ b/app/views/music2.twig @@ -1,7 +1,6 @@ {% extends 'templates/default.twig' %} {% block javascripts %} - {% endblock %} diff --git a/app/views/templates/default.twig b/app/views/templates/default.twig index 7f94ac9..7e774fc 100755 --- a/app/views/templates/default.twig +++ b/app/views/templates/default.twig @@ -1,28 +1,30 @@ - - - - {% block title %}{% endblock %} | Halftone - + + + + {% block title %}{% endblock %} | Halftone + + - {% block stylesheets %}{% endblock %} - + {% block stylesheets %}{% endblock %} + - - {% block javascripts %}{% endblock %} + + + {% block javascripts %}{% endblock %} -
-
- {% include 'templates/partials/header.twig' %} +
+
+ {% include 'templates/partials/header.twig' %} - {% block content %}{% endblock %} -
-
+ {% block content %}{% endblock %} +
+
- {% include 'templates/partials/footer.twig' %} + {% include 'templates/partials/footer.twig' %} diff --git a/public/js/music.js b/public/js/music.js index 2631b8d..c9d8809 100755 --- a/public/js/music.js +++ b/public/js/music.js @@ -1,7 +1,26 @@ $(document).ready(function() { - $('#music-player').musicPlayer({ - 'audio': '#music-player', - 'volume': .5, - 'startTime': 0 - }) -}); \ No newline at end of file + var player = new MediaElementPlayer('#music-player', { + // initial volume when the player starts + startVolume: 0.5, + // useful for