import shared media info component

2025-03-30 19:56:21 +00:00 · 2016-05-11 18:08:19 -04:00 · 2016-05-11 18:08:19 -04:00 · 014d70f5d7
commit 014d70f5d7
parent 31cb9f8d01
18 changed files with 489 additions and 31 deletions
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@ -16,12 +16,12 @@
  },
  "devDependencies": {},
  "ignore": [],
-  "version": "1.2.73",
-  "_release": "1.2.73",
+  "version": "1.2.75",
+  "_release": "1.2.75",
  "_resolution": {
    "type": "version",
-    "tag": "1.2.73",
-    "commit": "f6722bdc762cd5cc372010f6c812dcd7bf8d89c5"
+    "tag": "1.2.75",
+    "commit": "122d3aaefc1fe36b22916f03dac5eea73fbb2ba7"
  },
  "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
  "_target": "^1.2.0",
--- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
@ -1,4 +1,4 @@
-define(['dialogHelper', 'layoutManager', 'dialogText', 'paper-button', 'css!./actionsheet'], function (dialogHelper, layoutManager, dialogText) {
+define(['dialogHelper', 'layoutManager', 'dialogText', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html'], function (dialogHelper, layoutManager, dialogText) {

    function parentWithClass(elem, className) {

@ -132,7 +132,7 @@
        html += '<div class="actionSheetScroller">';

        options.items.forEach(function (o) {
-            o.ironIcon = o.selected ? 'check' : null;
+            o.ironIcon = o.selected ? 'nav:check' : null;
        });

        var itemsWithIcons = options.items.filter(function (o) {
--- a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
@ -1,4 +1,4 @@
-define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.html', 'css!./../prompt/style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
+define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../icons/nav.html', 'css!./../prompt/style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {

    function getIcon(icon, cssClass, canFocus, autoFocus) {

@ -72,7 +72,7 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.h

        var buttonText = options.type == 'error' ? 'Ok' : 'GotIt';
        if (raisedButtons) {
-            html += '<paper-button raised class="btnSubmit"><iron-icon icon="dialog:check"></iron-icon><span>' + dialogText.get(buttonText) + '</span></paper-button>';
+            html += '<paper-button raised class="btnSubmit"><iron-icon icon="nav:check"></iron-icon><span>' + dialogText.get(buttonText) + '</span></paper-button>';
        } else {
            html += '<div class="buttons" style="text-align:right;">';
            html += '<paper-button class="btnSubmit">' + dialogText.get(buttonText) + '</paper-button>';
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
@ -1,4 +1,4 @@
-define(['globalize', 'connectionManager', 'loading', 'scrollHelper', 'datetime', 'focusManager', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'clearButtonStyle', 'css!./guide.css', 'html!./icons.html', 'scrollStyles'], function (globalize, connectionManager, loading, scrollHelper, datetime, focusManager, imageLoader, events, layoutManager, itemShortcuts, registrationServices) {
+define(['globalize', 'connectionManager', 'loading', 'scrollHelper', 'datetime', 'focusManager', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'clearButtonStyle', 'css!./guide.css', 'html!./../icons/mediainfo.html', 'html!./../icons/nav.html', 'scrollStyles'], function (globalize, connectionManager, loading, scrollHelper, datetime, focusManager, imageLoader, events, layoutManager, itemShortcuts, registrationServices) {

    var baseUrl;

@ -271,14 +271,14 @@
                html += '</div>';

                if (program.IsHD) {
-                    html += '<iron-icon icon="guide:hd"></iron-icon>';
+                    html += '<iron-icon icon="mediainfo:hd"></iron-icon>';
                }

                if (program.SeriesTimerId) {
-                    html += '<iron-icon class="seriesTimerIcon" icon="guide:fiber-smart-record"></iron-icon>';
+                    html += '<iron-icon class="seriesTimerIcon" icon="mediainfo:fiber-smart-record"></iron-icon>';
                }
                else if (program.TimerId) {
-                    html += '<iron-icon class="timerIcon" icon="guide:fiber-manual-record"></iron-icon>';
+                    html += '<iron-icon class="timerIcon" icon="mediainfo:fiber-manual-record"></iron-icon>';
                }

                if (addAccent) {
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
@ -18,5 +18,5 @@

 <div class="guideRequiresUnlock readOnlyContent hide" style="margin:1em auto;text-align:center;padding:1em;flex-shrink:0;">
    <p class="unlockText"></p>
-    <paper-button raised class="secondary block btnUnlockGuide"><iron-icon icon="check"></iron-icon><span>${ButtonUnlockGuide}</span></paper-button>
+    <paper-button raised class="secondary block btnUnlockGuide"><iron-icon icon="nav:check"></iron-icon><span>${ButtonUnlockGuide}</span></paper-button>
 </div>
--- a/dashboard-ui/bower_components/emby-webcomponents/icons/mediainfo.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/icons/mediainfo.html
@ -31,12 +31,15 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
@demo demo/index.html
 -->

-<iron-iconset-svg name="guide" size="24">
+<iron-iconset-svg name="mediainfo" size="24">
    <svg>
        <defs>
            <g id="fiber-manual-record"><circle cx="12" cy="12" r="8" /></g>
            <g id="fiber-smart-record"><g><circle cx="9" cy="12" r="8" /><path d="M17 4.26v2.09c2.33.82 4 3.04 4 5.65s-1.67 4.83-4 5.65v2.09c3.45-.89 6-4.01 6-7.74s-2.55-6.85-6-7.74z" /></g></g>
            <g id="hd"><path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-8 12H9.5v-2h-2v2H6V9h1.5v2.5h2V9H11v6zm2-6h4c.55 0 1 .45 1 1v4c0 .55-.45 1-1 1h-4V9zm1.5 4.5h2v-3h-2v3z" /></g>
+            <g id="closed-caption"><path d="M19 4H5c-1.11 0-2 .9-2 2v12c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-8 7H9.5v-.5h-2v3h2V13H11v1c0 .55-.45 1-1 1H7c-.55 0-1-.45-1-1v-4c0-.55.45-1 1-1h3c.55 0 1 .45 1 1v1zm7 0h-1.5v-.5h-2v3h2V13H18v1c0 .55-.45 1-1 1h-3c-.55 0-1-.45-1-1v-4c0-.55.45-1 1-1h3c.55 0 1 .45 1 1v1z" /></g>
+            <g id="star"><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z" /></g>
+            <g id="star-half"><path d="M22 9.74l-7.19-.62L12 2.5 9.19 9.13 2 9.74l5.46 4.73-1.64 7.03L12 17.77l6.18 3.73-1.63-7.03L22 9.74zM12 15.9V6.6l1.71 4.04 4.38.38-3.32 2.88 1 4.28L12 15.9z" /></g>
        </defs>
    </svg>
 </iron-iconset-svg>
--- a/dashboard-ui/bower_components/emby-webcomponents/prompt/icons.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/icons.html
@ -31,7 +31,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
@demo demo/index.html
 -->

-<iron-iconset-svg name="dialog" size="24">
+<iron-iconset-svg name="nav" size="24">
    <svg>
        <defs>
            <g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></g>
--- a/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js
@ -0,0 +1,451 @@
+define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html'], function (datetime, globalize, embyRouter) {
+
+    function getProgramInfoHtml(item, options) {
+        var html = '';
+
+        var miscInfo = [];
+        var text, date;
+
+        if (item.ChannelName) {
+
+            if (options.interactive && item.ChannelId) {
+                miscInfo.push('<a class="lnkChannel" data-id="' + item.ChannelId + '" data-serverid="' + item.ServerId + '" href="#">' + item.ChannelName + '</a>');
+            } else {
+                miscInfo.push(item.ChannelName);
+            }
+        }
+
+        if (item.StartDate) {
+
+            try {
+                date = datetime.parseISO8601Date(item.StartDate);
+
+                text = date.toLocaleDateString();
+
+                text += ', ' + datetime.getDisplayTime(date);
+
+                if (item.EndDate) {
+                    date = datetime.parseISO8601Date(item.EndDate);
+                    text += ' - ' + datetime.getDisplayTime(date);
+                }
+
+                miscInfo.push(text);
+            }
+            catch (e) {
+                console.log("Error parsing date: " + item.PremiereDate);
+            }
+        }
+
+        if (item.ChannelNumber) {
+            miscInfo.push('CH ' + item.ChannelNumber);
+        }
+
+        html += miscInfo.map(function (m) {
+            return getMediaInfoItem(m);
+        }).join('');
+
+        return html;
+    }
+
+    function getMediaInfoHtml(item, options) {
+        var html = '';
+
+        var miscInfo = [];
+        options = options || {};
+        var text, date, minutes;
+
+        if (item.Type == "MusicAlbum" || item.MediaType == 'MusicArtist' || item.MediaType == 'Playlist' || item.MediaType == 'MusicGenre') {
+
+            var count = item.SongCount || item.ChildCount;
+
+            if (count) {
+
+                miscInfo.push(globalize.translate('core#TrackCount', count));
+            }
+
+            if (item.CumulativeRunTimeTicks) {
+
+                miscInfo.push(datetime.getDisplayRunningTime(item.CumulativeRunTimeTicks));
+            }
+        }
+
+        else if (item.Type == "PhotoAlbum" || item.Type == "BoxSet") {
+
+            var count = item.ChildCount;
+
+            if (count) {
+
+                miscInfo.push(globalize.translate('core#ItemCount', count));
+            }
+        }
+
+        if (item.Type == "Episode" || item.MediaType == 'Photo') {
+
+            if (item.PremiereDate) {
+
+                try {
+                    date = datetime.parseISO8601Date(item.PremiereDate);
+
+                    text = date.toLocaleDateString();
+                    miscInfo.push(text);
+                }
+                catch (e) {
+                    console.log("Error parsing date: " + item.PremiereDate);
+                }
+            }
+        }
+
+        if (item.StartDate && item.Type != 'Program') {
+
+            try {
+                date = datetime.parseISO8601Date(item.StartDate);
+
+                text = date.toLocaleDateString();
+                miscInfo.push(text);
+
+                if (item.Type != "Recording") {
+                    text = datetime.getDisplayTime(date);
+                    miscInfo.push(text);
+                }
+            }
+            catch (e) {
+                console.log("Error parsing date: " + item.PremiereDate);
+            }
+        }
+
+        if (item.ProductionYear && item.Type == "Series") {
+
+            if (item.Status == "Continuing") {
+                miscInfo.push(globalize.translate('core#ValueSeriesYearToPresent', item.ProductionYear));
+
+            }
+            else if (item.ProductionYear) {
+
+                text = item.ProductionYear;
+
+                if (item.EndDate) {
+
+                    try {
+
+                        var endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
+
+                        if (endYear != item.ProductionYear) {
+                            text += "-" + datetime.parseISO8601Date(item.EndDate).getFullYear();
+                        }
+
+                    }
+                    catch (e) {
+                        console.log("Error parsing date: " + item.EndDate);
+                    }
+                }
+
+                miscInfo.push(text);
+            }
+        }
+
+        if (item.Type == 'Program') {
+
+            if (item.PremiereDate) {
+
+                try {
+                    date = datetime.parseISO8601Date(item.PremiereDate);
+                    text = globalize.translate('core#OriginalAirDateValue', date.toLocaleDateString());
+                    miscInfo.push(text);
+                }
+                catch (e) {
+                    console.log("Error parsing date: " + item.PremiereDate);
+                }
+            } else if (item.ProductionYear) {
+                text = globalize.translate('core#ReleaseYearValue', item.ProductionYear);
+                miscInfo.push(text);
+            }
+        }
+
+        if (item.Type != "Series" && item.Type != "Episode" && item.Type != "Person" && item.MediaType != 'Photo' && item.Type != 'Program') {
+
+            if (item.ProductionYear) {
+
+                miscInfo.push(item.ProductionYear);
+            }
+            else if (item.PremiereDate) {
+
+                try {
+                    text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
+                    miscInfo.push(text);
+                }
+                catch (e) {
+                    console.log("Error parsing date: " + item.PremiereDate);
+                }
+            }
+        }
+
+        if (item.RunTimeTicks && item.Type != "Series" && item.Type != 'Program' && options.runtime !== false) {
+
+            if (item.Type == "Audio") {
+
+                miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
+
+            } else {
+                minutes = item.RunTimeTicks / 600000000;
+
+                minutes = minutes || 1;
+
+                miscInfo.push(Math.round(minutes) + " mins");
+            }
+        }
+
+        if (item.OfficialRating && item.Type !== "Season" && item.Type !== "Episode") {
+            miscInfo.push({
+                text: item.OfficialRating,
+                cssClass: 'mediaInfoOfficialRating'
+            });
+        }
+
+        if (item.HasSubtitles && options.subtitles !== false) {
+            miscInfo.push({
+                html: '<iron-icon class="mediaInfoItem closedCaptionIcon" icon="core:closed-caption"></iron-icon>'
+            });
+        }
+
+        if (item.Video3DFormat) {
+            miscInfo.push("3D");
+        }
+
+        if (item.MediaType == 'Photo' && item.Width && item.Height) {
+            miscInfo.push(item.Width + "x" + item.Height);
+        }
+
+        html += miscInfo.map(function (m) {
+            return getMediaInfoItem(m);
+        }).join('');
+
+        html += getStarIconsHtml(item);
+
+        if (item.CriticRating && options.criticRating !== false) {
+
+            if (item.CriticRating >= 60) {
+                html += '<div class="mediaInfoItem criticRating criticRatingFresh">' + item.CriticRating + '</div>';
+            } else {
+                html += '<div class="mediaInfoItem criticRating criticRatingRotten">' + item.CriticRating + '</div>';
+            }
+        }
+
+        if (options.endsAt !== false) {
+
+            var endsAt = getEndsAt(item);
+            if (endsAt) {
+                html += getMediaInfoItem(endsAt, 'endsAt');
+            }
+        }
+
+        return html;
+    }
+
+    function getEndsAt(item) {
+
+        if (item.MediaType == 'Video' && item.RunTimeTicks) {
+
+            if (!item.StartDate) {
+                var endDate = new Date().getTime() + (item.RunTimeTicks / 10000);
+                endDate = new Date(endDate);
+
+                var displayTime = datetime.getDisplayTime(endDate);
+                return globalize.translate('core#EndsAtValue', displayTime);
+            }
+        }
+
+        return null;
+    }
+
+    function getEndsAtFromPosition(runtimeTicks, positionTicks, includeText) {
+
+        var endDate = new Date().getTime() + ((runtimeTicks - (positionTicks || 0)) / 10000);
+        endDate = new Date(endDate);
+
+        var displayTime = datetime.getDisplayTime(endDate);
+
+        if (includeText === false) {
+            return displayTime;
+        }
+        return globalize.translate('core#EndsAtValue', displayTime);
+    }
+
+    function getMediaInfoItem(m, cssClass) {
+
+        cssClass = cssClass ? (cssClass + ' mediaInfoItem') : 'mediaInfoItem';
+        var mediaInfoText = m;
+
+        if (typeof (m) !== 'string' && typeof (m) !== 'number') {
+
+            if (m.html) {
+                return m.html;
+            }
+            mediaInfoText = m.text;
+            cssClass += ' ' + m.cssClass;
+        }
+        return '<div class="' + cssClass + '">' + mediaInfoText + '</div>';
+    }
+
+    function getStarIconsHtml(item) {
+
+        var html = '';
+
+        var rating = item.CommunityRating;
+
+        if (rating) {
+            html += '<div class="starRatingContainer mediaInfoItem">';
+
+            for (var i = 0; i < 5; i++) {
+                var starValue = (i + 1) * 2;
+
+                if (rating < starValue - 2) {
+                    html += '<iron-icon icon="core:star" class="emptyStar"></iron-icon>';
+                }
+                else if (rating < starValue) {
+                    html += '<iron-icon icon="core:star-half"></iron-icon>';
+                }
+                else {
+                    html += '<iron-icon icon="core:star"></iron-icon>';
+                }
+            }
+
+            html += '</div>';
+        }
+
+        return html;
+    }
+
+    function dynamicEndTime(elem, item) {
+
+        var interval = setInterval(function () {
+
+            if (!document.body.contains(elem)) {
+
+                clearInterval(interval);
+                return;
+            }
+
+            elem.innerHTML = getEndsAt(item);
+
+        }, 60000);
+    }
+
+    function fillPrimaryMediaInfo(elem, item, options) {
+        var html = getPrimaryMediaInfoHtml(item, options);
+
+        elem.innerHTML = html;
+        afterFill(elem, item, options);
+    }
+
+    function fillSecondaryMediaInfo(elem, item, options) {
+        var html = getSecondaryMediaInfoHtml(item, options);
+
+        elem.innerHTML = html;
+        afterFill(elem, item, options);
+    }
+
+    function afterFill(elem, item, options) {
+
+        var endsAtElem = elem.querySelector('.endsAt');
+        if (endsAtElem) {
+            dynamicEndTime(endsAtElem, item);
+        }
+
+        var lnkChannel = elem.querySelector('.lnkChannel');
+        if (lnkChannel) {
+            lnkChannel.addEventListener('click', onChannelLinkClick);
+        }
+    }
+
+    function onChannelLinkClick(e) {
+
+        var channelId = this.getAttribute('data-id');
+        var serverId = this.getAttribute('data-serverid');
+
+        embyRouter.showItem(channelId, serverId);
+
+        e.preventDefault();
+        return false;
+    }
+
+    function getDisplayName(item, options) {
+
+        if (!item) {
+            throw new Error("null item passed into getDisplayName");
+        }
+
+        options = options || {};
+
+        var name = item.EpisodeTitle || item.Name || '';
+
+        if (item.Type == "TvChannel") {
+
+            if (item.Number) {
+                return item.Number + ' ' + name;
+            }
+            return name;
+        }
+        if (options.isInlineSpecial && item.Type == "Episode" && item.ParentIndexNumber == 0) {
+
+            name = globalize.translate('core#ValueSpecialEpisodeName', name);
+
+        } else if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) {
+
+            var displayIndexNumber = item.IndexNumber;
+
+            var number = "E" + displayIndexNumber;
+
+            if (options.includeParentInfo !== false) {
+                number = "S" + item.ParentIndexNumber + ", " + number;
+            }
+
+            if (item.IndexNumberEnd) {
+
+                displayIndexNumber = item.IndexNumberEnd;
+                number += "-" + displayIndexNumber;
+            }
+
+            name = number + " - " + name;
+
+        }
+
+        return name;
+    }
+
+    function getPrimaryMediaInfoHtml(item, options) {
+
+        options = options || {};
+        if (options.interactive == null) {
+            options.interactive = false;
+        }
+        if (item.Type == 'Program') {
+            return getProgramInfoHtml(item, options);
+        }
+
+        return getMediaInfoHtml(item, options);
+    }
+
+    function getSecondaryMediaInfoHtml(item, options) {
+
+        options = options || {};
+        if (options.interactive == null) {
+            options.interactive = false;
+        }
+        if (item.Type == 'Program') {
+            return getMediaInfoHtml(item, options);
+        }
+
+        return '';
+    }
+
+    return {
+        getMediaInfoHtml: getPrimaryMediaInfoHtml,
+        fill: fillPrimaryMediaInfo,
+        getEndsAt: getEndsAt,
+        getEndsAtFromPosition: getEndsAtFromPosition,
+        getPrimaryMediaInfoHtml: getPrimaryMediaInfoHtml,
+        getSecondaryMediaInfoHtml: getSecondaryMediaInfoHtml,
+        fillPrimaryMediaInfo: fillPrimaryMediaInfo,
+        fillSecondaryMediaInfo: fillSecondaryMediaInfo
+    };
+});
--- a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
@ -1,4 +1,4 @@
-define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./icons.html', 'css!./style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
+define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../icons/nav.html', 'css!./style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {

    function getIcon(icon, cssClass, canFocus, autoFocus) {

@ -64,7 +64,7 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./icons.html', 'css

        html += '<br/>';
        if (raisedButtons) {
-            html += '<paper-button raised class="btnSubmit"><iron-icon icon="dialog:check"></iron-icon><span>' + dialogText.get('Ok') + '</span></paper-button>';
+            html += '<paper-button raised class="btnSubmit"><iron-icon icon="nav:check"></iron-icon><span>' + dialogText.get('Ok') + '</span></paper-button>';
        } else {
            html += '<div class="buttons">';
            html += '<paper-button class="btnSubmit">' + dialogText.get('Ok') + '</paper-button>';
--- a/dashboard-ui/bower_components/emby-webcomponents/router.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/router.js
@ -485,11 +485,11 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
        return show(pluginManager.mapRoute(skin, homeRoute));
    }

-    function showItem(item) {
+    function showItem(item, serverId) {

        if (typeof (item) === 'string') {
            require(['connectionManager'], function (connectionManager) {
-                var apiClient = connectionManager.currentApiClient();
+                var apiClient = serverId ? connectionManager.getApiClient(serverId) : connectionManager.currentApiClient();
                apiClient.getItem(apiClient.getCurrentUserId(), item).then(showItem);
            });
        } else {
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@ -36,7 +36,7 @@
    "tag": "v1.5.1",
    "commit": "e3e34408fad8f7cde59c4255cf3fe90f7dcf91d8"
  },
-  "_source": "git://github.com/PolymerElements/iron-selector.git",
+  "_source": "git://github.com/polymerelements/iron-selector.git",
  "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-selector"
+  "_originalSource": "polymerelements/iron-selector"
 }
--- a/dashboard-ui/bower_components/paper-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json
@ -45,7 +45,7 @@
    "tag": "v1.0.11",
    "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
  },
-  "_source": "git://github.com/polymerelements/paper-behaviors.git",
+  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
  "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-behaviors"
+  "_originalSource": "PolymerElements/paper-behaviors"
 }
--- a/dashboard-ui/bower_components/paper-ripple/.bower.json
+++ b/dashboard-ui/bower_components/paper-ripple/.bower.json
@ -32,14 +32,14 @@
    "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
  },
  "ignore": [],
-  "homepage": "https://github.com/polymerelements/paper-ripple",
+  "homepage": "https://github.com/PolymerElements/paper-ripple",
  "_release": "1.0.5",
  "_resolution": {
    "type": "version",
    "tag": "v1.0.5",
    "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
  },
-  "_source": "git://github.com/polymerelements/paper-ripple.git",
+  "_source": "git://github.com/PolymerElements/paper-ripple.git",
  "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-ripple"
+  "_originalSource": "PolymerElements/paper-ripple"
 }
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@ -669,14 +669,12 @@
            $('#tagsCollapsible', context).hide();
            $('#metadataSettingsCollapsible', context).hide();
            $('#fldPremiereDate', context).hide();
-            $('#fldSortName', context).hide();
            $('#fldDateAdded', context).hide();
            $('#fldYear', context).hide();
        } else {
            $('#tagsCollapsible', context).show();
            $('#metadataSettingsCollapsible', context).show();
            $('#fldPremiereDate', context).show();
-            $('#fldSortName', context).show();
            $('#fldDateAdded', context).show();
            $('#fldYear', context).show();
        }
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@ -29,7 +29,7 @@
            <div id="fldOriginalName">
                <paper-input id="txtOriginalName" type="text" label="${LabelOriginalTitle}"></paper-input>
            </div>
-            <div id="fldSortName" style="display: none;">
+            <div>
                <paper-input id="txtSortName" type="text" label="${LabelSortTitle}"></paper-input>
            </div>
            <div id="fldDateAdded" style="display: none;">
--- a/dashboard-ui/scripts/editorsidebar.js
+++ b/dashboard-ui/scripts/editorsidebar.js
@ -147,7 +147,12 @@

    function loadLiveTvChannels(service, openItems, callback) {

-        ApiClient.getLiveTvChannels({ ServiceName: service, AddCurrentProgram: false }).then(function (result) {
+        ApiClient.getLiveTvChannels({
+
+            ServiceName: service,
+            AddCurrentProgram: false
+
+        }).then(function (result) {

            var nodes = result.Items.map(function (i) {

--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@ -98,7 +98,7 @@
        ApiClient.getLiveTvRecordings({

            userId: Dashboard.getCurrentUserId(),
-            limit: 12,
+            limit: 6,
            IsInProgress: false,
            Fields: 'CanDelete,PrimaryImageAspectRatio'

--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@ -1820,6 +1820,7 @@ var AppInfo = {};

        define("libjass", [bowerPath + "/libjass/libjass", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency);

+        define("mediaInfo", [embyWebComponentsBowerPath + "/mediaInfo/mediaInfo"], returnFirstDependency);
        define("backdrop", [embyWebComponentsBowerPath + "/backdrop/backdrop"], returnFirstDependency);
        define("fetchHelper", [embyWebComponentsBowerPath + "/fetchhelper"], returnFirstDependency);