diff --git a/src/components/htmlaudioplayer/plugin.js b/src/components/htmlaudioplayer/plugin.js index 1b41cc544d..ef64bad046 100644 --- a/src/components/htmlaudioplayer/plugin.js +++ b/src/components/htmlaudioplayer/plugin.js @@ -2,11 +2,8 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp "use strict"; function getDefaultProfile() { - return new Promise(function (resolve, reject) { - require(['browserdeviceprofile'], function (profileBuilder) { - resolve(profileBuilder({})); }); }); @@ -14,28 +11,22 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp var fadeTimeout; function fade(instance, elem, startingVolume) { - instance._isFadingOut = true; // Need to record the starting volume on each pass rather than querying elem.volume // This is due to iOS safari not allowing volume changes and always returning the system volume value - var newVolume = Math.max(0, startingVolume - 0.15); console.log('fading volume to ' + newVolume); elem.volume = newVolume; if (newVolume <= 0) { - instance._isFadingOut = false; return Promise.resolve(); } return new Promise(function (resolve, reject) { - cancelFadeTimeout(); - fadeTimeout = setTimeout(function () { - fade(instance, elem, newVolume).then(resolve, reject); }, 100); }); @@ -50,7 +41,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp } function supportsFade() { - if (browser.tv) { // Not working on tizen. // We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive @@ -68,9 +58,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp } function enableHlsPlayer(url, item, mediaSource, mediaType) { - if (!htmlMediaHelper.enableHlsJsPlayer(mediaSource.RunTimeTicks, mediaType)) { - return Promise.reject(); } @@ -86,21 +74,18 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp url: url, type: 'HEAD' }).then(function (response) { - var contentType = (response.headers.get('Content-Type') || '').toLowerCase(); if (contentType === 'application/x-mpegurl') { resolve(); } else { reject(); } - }, reject); }); }); } function HtmlAudioPlayer() { - var self = this; self.name = 'Html Audio Player'; @@ -114,11 +99,9 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp self._started = false; self._timeUpdated = false; - self._currentTime = null; var elem = createMediaElement(options); - return setCurrentSrc(elem, options); }; @@ -511,4 +494,4 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp }; return HtmlAudioPlayer; -}); \ No newline at end of file +}); diff --git a/src/css/librarybrowser.css b/src/css/librarybrowser.css index 152693e9b6..130c37f45f 100644 --- a/src/css/librarybrowser.css +++ b/src/css/librarybrowser.css @@ -449,11 +449,9 @@ } .detailImageContainer { - margin-right: 2em; width: 280px; - -webkit-flex-shrink: 0; + margin-right: 2em; flex-shrink: 0; - margin-left: .6em } .detailPagePrimaryContent {