diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-25 16:36:58 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-25 16:36:58 +0100 |
| commit | ea8f71a19c59e7138d4a504bacc0beb410fc77e8 (patch) | |
| tree | 5c4da1ddafb6d81feb90d3a70e927e59dc0a5e0d /apps/media/js/music.js | |
| parent | 814bc2fd2bef739938716ae840a4db0de502422a (diff) | |
| parent | 8b93a9a237603185501d0e24e9c08705168fc553 (diff) | |
| download | nextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.tar.gz nextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.zip | |
Merge branch 'master' into encryption
Diffstat (limited to 'apps/media/js/music.js')
| -rw-r--r-- | apps/media/js/music.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/apps/media/js/music.js b/apps/media/js/music.js index 3373cbac257..1ffe4e10087 100644 --- a/apps/media/js/music.js +++ b/apps/media/js/music.js @@ -16,7 +16,7 @@ $(document).ready(function(){ PlayList.render(); }); var button=$('<input type="button" title="'+t('media','Add album to playlist')+'" class="add"></input>'); - button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')') + button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')'); button.click(function(event){ event.stopPropagation(); PlayList.add(media); @@ -24,7 +24,7 @@ $(document).ready(function(){ }); row.find('div.name').append(button); button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true}); - } + }; Collection.display(); Collection.load(function(){ @@ -34,11 +34,9 @@ $(document).ready(function(){ PlayList.add(song); PlayList.play(0); } - }) + }); }); - - function getUrlVars(){ var vars = {}, hash; var hashes = window.location.hash.substr(1).split('&'); @@ -52,8 +50,8 @@ function getUrlVars(){ function musicTypeFromFile(file){ var extention=file.split('.').pop(); if(extention=='ogg'){ - return 'oga' + return 'oga'; } //TODO check for more specific cases return extention; -}
\ No newline at end of file +} |