diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index 294bf0d365..9874d7dc36 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -61,7 +61,7 @@ diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 9a63e3a085..39b007046f 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -19,7 +19,7 @@ Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) { if (pluginSecurityInfo.IsMBSupporter) { - $('#contribute', page).show(); + $('#contribute', page).hide(); } else { $('#contribute', page).show(); } diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index b469d7b527..3d23f4093a 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -239,15 +239,14 @@ currentSrc = replaceQueryString(currentSrc, 'MaxWidth', finalParams.maxWidth); currentSrc = replaceQueryString(currentSrc, 'VideoBitrate', finalParams.videoBitrate); currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate); + currentSrc = replaceQueryString(currentSrc, 'Static', finalParams.isStatic); if (finalParams.isStatic) { currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4'); } else { - currentSrc = currentSrc.replace('.mp4', getTranscodingExtension()); + currentSrc = currentSrc.replace('.mp4', transcodingExtension); } - currentSrc = replaceQueryString(currentSrc, 'Static', finalParams.isStatic); - clearProgressInterval(); $(element).off('ended.playbackstopped').off('ended.playnext').on("play.onceafterseek", function () { @@ -1852,19 +1851,7 @@ var currentSrc = currentMediaElement.currentSrc.toLowerCase(); var isStatic = currentSrc.indexOf('static=true') != -1; - var transcodingExtension = isStatic ? getTranscodingExtension() : null; - - if (!transcodingExtension) { - if (currentSrc.indexOf('.m3u8') != -1) { - transcodingExtension = '.m3u8'; - } - else if (currentSrc.indexOf('.webm') != -1) { - transcodingExtension = '.webm'; - } - else { - transcodingExtension = '.mp4'; - } - } + var transcodingExtension = getTranscodingExtension(); var currentAudioStreamIndex = getParameterByName('AudioStreamIndex', currentMediaElement.currentSrc);