diff --git a/embed.html b/embed.html index 272026f7..e601f830 100644 --- a/embed.html +++ b/embed.html @@ -2,7 +2,7 @@ diff --git a/js/embed.js b/js/embed.js index 6b7cbf5d..c11117fb 100644 --- a/js/embed.js +++ b/js/embed.js @@ -42,8 +42,7 @@ var initFromTemplate = function (template) { 'volume': 50, 'balance': 0, 'mediaFile': { - 'url': scriptTag.dataset.media, - 'name': scriptTag.dataset.trackname + 'url': scriptTag.dataset.media }, 'skinUrl': 'https://cdn.rawgit.com/captbaritone/winamp-skins/master/v2/base-2.91.wsz' }); diff --git a/js/winamp.js b/js/winamp.js index 532f56c6..7e5d7f5e 100755 --- a/js/winamp.js +++ b/js/winamp.js @@ -31,7 +31,8 @@ Winamp = { this.setVolume(options.volume); this.setBalance(options.balance); - this.loadFromUrl(options.mediaFile.url, options.mediaFile.name); + var filename = options.mediaFile.name ? options.mediaFile.name : false; + this.loadFromUrl(options.mediaFile.url, filename); var skinFile = new MyFile(); skinFile.setUrl(options.skinUrl); this.setSkin(skinFile); @@ -219,7 +220,12 @@ Winamp = { // Used only for the initial load, since it must have a CORS header loadFromUrl: function(url, fileName) { - this.fileName = fileName; + if(fileName) { + this.fileName = fileName; + } else { + this.fileName = url.split('/').pop(); + } + var file = new MyFile(); file.setUrl(url); file.processBuffer(this._loadBuffer.bind(this));