update device discovery

2025-03-30 19:56:21 +00:00 · 2016-09-13 13:49:13 -04:00 · 2016-09-13 13:49:13 -04:00 · fdc83ada98
commit fdc83ada98
parent 62265de2e5
21 changed files with 119 additions and 80 deletions
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@ -14,12 +14,12 @@
  },
  "devDependencies": {},
  "ignore": [],
-  "version": "1.4.241",
-  "_release": "1.4.241",
+  "version": "1.4.242",
+  "_release": "1.4.242",
  "_resolution": {
    "type": "version",
-    "tag": "1.4.241",
-    "commit": "80b01c00ce8c5dd7d369b76d792675cb5dd36a75"
+    "tag": "1.4.242",
+    "commit": "1304a0000b9088f09c877eef42cf1f62bd42ebe9"
  },
  "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
  "_target": "^1.2.1",
--- a/dashboard-ui/bower_components/emby-webcomponents/datetime.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/datetime.js
@ -103,8 +103,14 @@
        return false;
    }();

+    function getCurrentLocale() {
+        var locale = globalize.getCurrentLocale();
+
+        return locale;
+    }
+
    function toLocaleString(date) {
-        var currentLocale = globalize.getCurrentLocale();
+        var currentLocale = getCurrentLocale();

        return currentLocale && toLocaleTimeStringSupportsLocales ?
            date.toLocaleString(currentLocale) :
@ -143,7 +149,7 @@

    function toLocaleDateString(date) {

-        var currentLocale = globalize.getCurrentLocale();
+        var currentLocale = getCurrentLocale();

        return currentLocale && toLocaleTimeStringSupportsLocales ?
            date.toLocaleDateString(currentLocale) :
@ -152,7 +158,7 @@

    function toLocaleTimeString(date) {

-        var currentLocale = globalize.getCurrentLocale();
+        var currentLocale = getCurrentLocale();

        return currentLocale && toLocaleTimeStringSupportsLocales ?
            date.toLocaleTimeString(currentLocale) :
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-input/emby-input.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-input/emby-input.css
@ -21,6 +21,8 @@
    width: 100%;
    background-color: transparent;
    border-radius: 0;
+    /* Ensure it is over the label so that it can be clicked */
+    position: relative;
 }

 .inputContainer {
--- a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
@ -54,6 +54,7 @@
    z-index: 1;
    align-items: center;
    justify-content: center;
+    flex-wrap: wrap;
 }

 .formDialogFooterItem {
@ -61,6 +62,7 @@
    margin-right: .5em !important;
    flex-grow: 1;
    text-align: center;
+    flex-basis: 0;
 }

@media all and (min-width: 800px) {
--- a/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
@ -7,12 +7,6 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser

        if (window.IntersectionObserver) {

-            // The api exists in chrome 50 but doesn't work
-            if (browser.chrome) {
-
-                var version = parseInt(browser.version.split('.')[0]);
-                return version >= 51;
-            }
            return true;
        }

--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js
@ -2,9 +2,34 @@

    var currentDialog;
    var recordingUpdated = false;
+    var recordingDeleted = false;
    var currentItemId;
    var currentServerId;

+    function deleteTimer(apiClient, timerId) {
+
+        return new Promise(function (resolve, reject) {
+
+            require(['confirm'], function (confirm) {
+
+                confirm(globalize.translate('sharedcomponents#MessageConfirmRecordingCancellation'), globalize.translate('sharedcomponents#HeaderConfirmRecordingCancellation')).then(function () {
+
+                    loading.show();
+
+                    apiClient.cancelLiveTvTimer(timerId).then(function () {
+
+                        require(['toast'], function (toast) {
+                            toast(globalize.translate('sharedcomponents#RecordingCancelled'));
+                        });
+
+                        loading.hide();
+                        resolve();
+                    });
+                });
+            });
+        });
+    }
+
    function renderTimer(context, item) {

        var programInfo = item.ProgramInfo || {};
@ -34,9 +59,10 @@
        loading.hide();
    }

-    function closeDialog(isSubmitted) {
+    function closeDialog(isSubmitted, isDeleted) {

        recordingUpdated = isSubmitted;
+        recordingDeleted = isDeleted;
        dialogHelper.close(currentDialog);
    }

@ -74,6 +100,14 @@
            closeDialog(false);
        });

+        context.querySelector('.btnCancelRecording').addEventListener('click', function () {
+
+            var apiClient = connectionManager.getApiClient(currentServerId);
+            deleteTimer(apiClient, currentItemId).then(function () {
+                closeDialog(true, true);
+            });
+        });
+
        context.querySelector('form').addEventListener('submit', onSubmit);
    }

@ -95,6 +129,7 @@
        return new Promise(function (resolve, reject) {

            recordingUpdated = false;
+            recordingDeleted = false;
            currentServerId = serverId;
            loading.show();

@ -129,7 +164,7 @@
                    if (recordingUpdated) {
                        resolve({
                            updated: true,
-                            deleted: false
+                            deleted: recordingDeleted
                        });
                    } else {
                        reject();
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html
@ -30,6 +30,9 @@
                <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit" autofocus>
                    <span>${Save}</span>
                </button>
+                <button is="emby-button" type="button" class="raised btnCancelRecording block formDialogFooterItem button-cancel" style="white-space:nowrap;" autofocus>
+                    <span>${HeaderCancelRecording}</span>
+                </button>
            </div>

        </form>
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json
@ -283,5 +283,6 @@
  "LiveBroadcasts": "Live broadcasts",
  "Premieres": "Premieres",
  "RepeatEpisodes": "Repeat episodes",
-  "DvrSubscriptionRequired": "Emby DVR requires an active Emby Premiere subscription."
+  "DvrSubscriptionRequired": "Emby DVR requires an active Emby Premiere subscription.",
+  "HeaderCancelRecording": "Cancel Recording"
 }
--- a/dashboard-ui/bower_components/iron-icon/.bower.json
+++ b/dashboard-ui/bower_components/iron-icon/.bower.json
@ -32,14 +32,14 @@
    "web-component-tester": "^4.0.0",
    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
  },
-  "homepage": "https://github.com/polymerelements/iron-icon",
+  "homepage": "https://github.com/PolymerElements/iron-icon",
  "_release": "1.0.10",
  "_resolution": {
    "type": "version",
    "tag": "v1.0.10",
    "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
  },
-  "_source": "git://github.com/polymerelements/iron-icon.git",
+  "_source": "git://github.com/PolymerElements/iron-icon.git",
  "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-icon"
+  "_originalSource": "PolymerElements/iron-icon"
 }
--- a/dashboard-ui/bower_components/iron-meta/.bower.json
+++ b/dashboard-ui/bower_components/iron-meta/.bower.json
@ -27,14 +27,14 @@
  },
  "main": "iron-meta.html",
  "ignore": [],
-  "homepage": "https://github.com/PolymerElements/iron-meta",
+  "homepage": "https://github.com/polymerelements/iron-meta",
  "_release": "1.1.2",
  "_resolution": {
    "type": "version",
    "tag": "v1.1.2",
    "commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a"
  },
-  "_source": "git://github.com/PolymerElements/iron-meta.git",
+  "_source": "git://github.com/polymerelements/iron-meta.git",
  "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-meta"
+  "_originalSource": "polymerelements/iron-meta"
 }
--- a/dashboard-ui/bower_components/polymer/.bower.json
+++ b/dashboard-ui/bower_components/polymer/.bower.json
@ -40,6 +40,6 @@
    "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
  },
  "_source": "git://github.com/Polymer/polymer.git",
-  "_target": "^1.1.0",
+  "_target": "^1.2.0",
  "_originalSource": "Polymer/polymer"
 }
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@ -212,25 +212,6 @@ div[data-role='page'] {
    transform: translateY(-210%);
 }

-.checkboxContainer {
-    white-space: nowrap;
-}
-
-    .checkboxContainer input:not([is=emby-checkbox]) {
-        width: 20px;
-        height: 20px;
-        vertical-align: middle;
-        display: inline-block;
-        margin: 0;
-        padding: 0;
-    }
-
-    .checkboxContainer label:not(.mdl-checkbox) {
-        vertical-align: middle;
-        display: inline-block;
-        padding: .7em .5em;
-    }
-
 textarea {
    width: 100%;
 }
--- a/dashboard-ui/dashboard/livetvtunerprovider-satip.js
+++ b/dashboard-ui/dashboard/livetvtunerprovider-satip.js
@ -1,4 +1,4 @@
-define([], function () {
+define(['emby-checkbox'], function () {

    function reload(page, providerId) {

--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@ -92,7 +92,9 @@
                </div>
                <br />
                <div>
-                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>
                </div>
            </form>

--- a/dashboard-ui/livetvtunerprovider-satip.html
+++ b/dashboard-ui/livetvtunerprovider-satip.html
@ -54,12 +54,14 @@
                                <option value="">${OptionNone}</option>
                            </select>
                        </div>
-                        <div>
-                            <br />
-                            <paper-checkbox class="chkEnabled" checked>${LabelEnableThisTuner}</paper-checkbox>
-                            <div class="fieldDescription paperCheckboxFieldDescription">${LabelEnableThisTunerHelp}</div>
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input type="checkbox" is="emby-checkbox" class="chkEnabled" />
+                                <span>${LabelEnableThisTuner}</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">${LabelEnableThisTunerHelp}</div>
                        </div>
-                        <br /><br />
+                        <br />
                        <div>
                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@ -168,20 +168,20 @@

                    itemHtml += '<i class="listItemIcon md-icon">dvr</i>';

-                    itemHtml += '<div class="listItemBody three-line">';
+                    itemHtml += '<div class="listItemBody two-line">';

-                    itemHtml += '<h3 class="listItemBodyText">';
+                    itemHtml += '<div class="listItemBodyText">';
                    itemHtml += item.Title;
-                    itemHtml += '</h3>';
+                    itemHtml += '</div>';

                    itemHtml += '<div class="listItemBodyText secondary">';
                    var date = datetime.parseISO8601Date(item.Date, true);
                    itemHtml += date.toLocaleDateString();
                    itemHtml += '</div>';

-                    itemHtml += '<div class="listItemBodyText secondary listItemBodyText-nowrap">';
-                    itemHtml += item.Description;
-                    itemHtml += '</div>';
+                    //itemHtml += '<div class="listItemBodyText secondary listItemBodyText-nowrap">';
+                    //itemHtml += item.Description;
+                    //itemHtml += '</div>';

                    itemHtml += '</div>';

@ -1067,9 +1067,9 @@

            html += '<div class="listItemBody three-line">';

-            html += '<h3 class="listItemBodyText">';
+            html += '<div class="listItemBodyText">';
            html += entry.Name;
-            html += '</h3>';
+            html += '</div>';

            html += '<div class="listItemBodyText secondary">';
            var date = datetime.parseISO8601Date(entry.Date, true);
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@ -1633,7 +1633,7 @@ var AppInfo = {};
            define("imageFetcher", [embyWebComponentsBowerPath + "/images/basicimagefetcher"], returnFirstDependency);
        }

-        var preferNativeAlerts = browser.mobile || browser.tv || browser.xboxOne;
+        var preferNativeAlerts = (browser.mobile && !browser.animate) || browser.tv || browser.xboxOne || browser.ps4;
        // use native alerts if preferred and supported (not supported in opera tv)
        if (preferNativeAlerts && window.alert) {
            define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency);
@ -2182,7 +2182,7 @@ var AppInfo = {};

        defineRoute({
            path: '/livetvtunerprovider-satip.html',
-            dependencies: ['emby-input', 'paper-checkbox'],
+            dependencies: ['emby-input'],
            autoFocus: false,
            roles: 'admin',
            controller: 'dashboard/livetvtunerprovider-satip'
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@ -90,7 +90,7 @@
  "LabelCountry": "Country:",
  "LabelLanguage": "Language:",
  "LabelTimeLimitHours": "Time limit (hours):",
-  "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+  "HeaderPreferredMetadataLanguage": "Preferred Metadata Language",
  "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
  "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
  "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@ -151,9 +151,13 @@
                </div>
                <br />
                <div>
-                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>

-                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">
+                        <span>${ButtonCancel}</span>
+                    </button>
                </div>
            </form>
        </div>
--- a/dashboard-ui/wizardagreement.html
+++ b/dashboard-ui/wizardagreement.html
@ -1,4 +1,4 @@
-<div id="wizardAgreementPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardagreement,paper-checkbox,emby-button">
+<div id="wizardAgreementPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardagreement,emby-checkbox,emby-button">

    <div data-role="content">

@ -13,9 +13,10 @@

                <p style="margin:1.5em 0;"><a href="http://emby.media/privacy" target="_blank">${ButtonPrivacyPolicy}</a></p>
                <p style="margin:1.5em 0;"><a href="http://emby.media/terms" target="_blank">${ButtonTermsOfService}</a></p>
-                <div>
-                    <paper-checkbox class="chkAccept" checked>${OptionIAcceptTermsOfService}</paper-checkbox>
-                </div>
+                <label class="checkboxContainer">
+                    <input type="checkbox" is="emby-checkbox" class="chkAccept" />
+                    <span>${OptionIAcceptTermsOfService}</span>
+                </label>

                <div class="wizardNavigation">
                    <button is="emby-button" type="button" onclick="history.back();" class="raised button-cancel">
--- a/dashboard-ui/wizardsettings.html
+++ b/dashboard-ui/wizardsettings.html
@ -1,4 +1,4 @@
-<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardsettings,paper-checkbox,emby-button">
+<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardsettings,emby-checkbox,emby-button,emby-select">

    <div data-role="content">

@ -7,26 +7,32 @@
                <h1>
                    ${LabelConfigureSettings}
                </h1>
-                <div style="margin: 3em 0;">
-                    <paper-checkbox class="chkEnableInternetProviders" checked>${LabelDownloadInternetMetadata}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
+                <br/>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" class="chkEnableInternetProviders" />
+                        <span>${LabelDownloadInternetMetadata}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
                </div>
-                <div>
-                    <paper-checkbox class="chkSaveLocalMetadata">${LabelSaveLocalMetadata}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" class="chkSaveLocalMetadata" />
+                        <span>${LabelSaveLocalMetadata}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
                </div>

-                <h1 style="margin-top: 1.5em;">${HeaderPreferredMetadataLanguage}</h1>
+                <h1 style="margin:2em 0 1.5em;">${HeaderPreferredMetadataLanguage}</h1>

-                <div style="margin: 2em 0;">
-                    <label for="selectLanguage" class="selectLabel">${LabelLanguage}</label>
-                    <select name="selectLanguage" id="selectLanguage" data-mini="true" required="required"></select>
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectLanguage" required="required" label="${LabelLanguage}"></select>
                </div>

-                <div style="margin: 2em 0;">
-                    <label for="selectCountry" class="selectLabel">${LabelCountry}</label>
-                    <select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectCountry" required="required" label="${LabelCountry}"></select>
                </div>
+                <br />

                <div class="wizardNavigation">
                    <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>