Merge pull request #2068 from MediaBrowser/dev

Dev

dashboard-ui/autoorganizelog.html

@@ -1,4 +1,4 @@
-<div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage withTabs fullWidthContent" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,scripts/autoorganizelog,scripts/taskbutton,detailtablecss">
+<div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage withTabs fullWidthContent" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,scripts/autoorganizelog,detailtablecss">
     <div data-role="content">
         <div class="content-primary">
 

dashboard-ui/bower_components/emby-webcomponents/guide/guide.js

@@ -148,6 +148,8 @@
 
                 channelQuery.Limit = channelLimit;
                 channelQuery.AddCurrentProgram = false;
+                channelQuery.EnableUserData = false;
+                channelQuery.EnableImageTypes = "Primary";
 
                 channelsPromise = channelsPromise || apiClient.getLiveTvChannels(channelQuery);
 
@@ -169,9 +171,10 @@
                             return c.Id;
                         }).join(','),
                         ImageTypeLimit: 1,
-                        EnableImageTypes: "Primary,Backdrop",
+                        EnableImageTypes: layoutManager.tv ? "Primary,Backdrop" : "Primary",
                         SortBy: "StartDate",
-                        EnableTotalRecordCount: false
+                        EnableTotalRecordCount: false,
+                        EnableUserData: false
 
                     }).then(function (programsResult) {
 

dashboard-ui/components/syncjoblist/syncjoblist.js

@@ -198,6 +198,8 @@ globalize.translate('CancelSyncJobConfirmation');
 
         if (listInstance.options.isLocalSync) {
             options.TargetId = apiClient.deviceId();
+        } else {
+            options.ExcludeTargetIds = apiClient.deviceId();
         }
 
         return apiClient.getJSON(ApiClient.getUrl('Sync/Jobs', options)).then(function (response) {
@@ -303,7 +305,7 @@ globalize.translate('CancelSyncJobConfirmation');
         this.options = options;
 
         var onSyncJobsUpdatedHandler = onSyncJobsUpdated.bind(this);
-        this.onSyncJobsUpdatedHandler = null;
+        this.onSyncJobsUpdatedHandler = onSyncJobsUpdatedHandler;
         events.on(serverNotifications, 'SyncJobs', onSyncJobsUpdatedHandler);
 
         var onClickHandler = onElementClick.bind(this);
@@ -318,15 +320,15 @@ globalize.translate('CancelSyncJobConfirmation');
 
         stopListening(this);
 
-        this.options = null;
-
         var onSyncJobsUpdatedHandler = this.onSyncJobsUpdatedHandler;
         this.onSyncJobsUpdatedHandler = null;
         events.off(serverNotifications, 'SyncJobs', onSyncJobsUpdatedHandler);
 
         var onClickHandler = this.onClickHandler;
         this.onClickHandler = null;
-        options.element.removeEventListener('click', onClickHandler);
+        this.options.element.removeEventListener('click', onClickHandler);
+
+        this.options = null;
     };
 
     return syncJobList;

dashboard-ui/library.html

@@ -1,4 +1,4 @@
-<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage withTabs fullWidthContent" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/medialibrarypage,scripts/taskbutton">
+<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage withTabs fullWidthContent" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/medialibrarypage">
 
     <div data-role="content">
         <div class="content-primary">

dashboard-ui/livetvstatus.html

@@ -1,4 +1,4 @@
-<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,emby-button">
+<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,emby-button">
 
     <div data-role="content">
         <div class="content-primary">

dashboard-ui/mysync.html

@@ -2,9 +2,14 @@
 
     <style>
         .status-text-icon {
-            font-size: 80%;
+            font-size: 94%;
             background-color: #444;
+            display: inline-flex;
+            align-items: center;
+            text-align: center;
+            justify-content: center;
         }
+
         .zeroProgressStatus {
             background-color: #444;
         }

dashboard-ui/scripts/autoorganizelog.js

@@ -1,4 +1,4 @@
-define(['jQuery', 'datetime', 'paper-icon-button-light'], function ($, datetime) {
+define(['jQuery', 'scripts/taskbutton', 'datetime', 'paper-icon-button-light'], function ($, taskButton, datetime) {
 
     var query = {
 
@@ -309,11 +309,12 @@
         reloadItems(page);
 
         // on here
-        $('.btnOrganize', page).taskButton({
+        taskButton({
             mode: 'on',
             progressElem: page.querySelector('.organizeProgress'),
             panel: page.querySelector('.organizeTaskPanel'),
-            taskKey: 'AutoOrganize'
+            taskKey: 'AutoOrganize',
+            button: page.querySelector('.btnOrganize')
         });
 
         Events.on(ApiClient, 'websocketmessage', onWebSocketMessage);
@@ -325,8 +326,9 @@
         currentResult = null;
 
         // off here
-        $('.btnOrganize', page).taskButton({
+        taskButton({
-            mode: 'off'
+            mode: 'off',
+            button: page.querySelector('.btnOrganize')
         });
 
         Events.off(ApiClient, 'websocketmessage', onWebSocketMessage);

dashboard-ui/scripts/librarybrowser.js

@@ -164,13 +164,18 @@
                 }
 
                 ownerpage.addEventListener('viewbeforeshow', function () {
-                    if (tabs.triggerBeforeTabChange) {
+                    if (tabs.triggerBeforeTabChange && this.firstTabIndex == null) {
                         tabs.triggerBeforeTabChange();
                     }
                 });
 
                 ownerpage.addEventListener('viewshow', function () {
-                    tabs.triggerTabChange();
+                    if (this.firstTabIndex) {
+                        tabs.selectedIndex(this.firstTabIndex);
+                        this.firstTabIndex = null;
+                    } else {
+                        tabs.triggerTabChange();
+                    }
                 });
 
                 tabs.addEventListener('beforetabchange', function (e) {
@@ -195,10 +200,8 @@
 
                 var afterNavigate = function () {
 
-                    document.removeEventListener('pagebeforeshow', afterNavigate);
+                    document.removeEventListener('pageinit', afterNavigate);
-
                     if (window.location.href.toLowerCase().indexOf(url.toLowerCase()) != -1) {
-
                         this.firstTabIndex = index;
                     }
                 };
@@ -208,7 +211,7 @@
                     afterNavigate.call(viewManager.currentView());
                 } else {
 
-                    pageClassOn('pagebeforeshow', 'page', afterNavigate);
+                    pageClassOn('pageinit', 'page', afterNavigate);
                     Dashboard.navigate(url);
                 }
             },

dashboard-ui/scripts/librarymenu.js

@@ -674,7 +674,7 @@
                     return;
                 }
 
-                viewMenuBarTabs.querySelector('is=["emby-tabs"]').selectedIndex(selectedIndex);
+                viewMenuBarTabs.querySelector('[is="emby-tabs"]').selectedIndex(selectedIndex);
 
                 LibraryMenu.tabType = type;
             });
@@ -797,11 +797,11 @@
             else if (isReportsPage && itemId == 'reports') {
                 lnkMediaFolder.classList.add('selectedMediaFolder');
             }
-            else if (isMySyncPage && itemId == 'manageoffline') {
+            else if (isMySyncPage && itemId == 'manageoffline' && window.location.href.toString().indexOf('mode=offline') != -1) {
 
                 lnkMediaFolder.classList.add('selectedMediaFolder');
             }
-            else if (isMySyncPage && itemId == 'syncotherdevices') {
+            else if (isMySyncPage && itemId == 'syncotherdevices' && window.location.href.toString().indexOf('mode=offline') == -1) {
 
                 lnkMediaFolder.classList.add('selectedMediaFolder');
             }
@@ -814,22 +814,6 @@
         }
     }
 
-    function replaceQueryString(url, param, value) {
-        var re = new RegExp("([?|&])" + param + "=.*?(&|$)", "i");
-        if (url.match(re))
-            return url.replace(re, '$1' + param + "=" + value + '$2');
-        else if (value) {
-
-            if (url.indexOf('?') == -1) {
-                return url + '?' + param + "=" + value;
-            }
-
-            return url + '&' + param + "=" + value;
-        }
-
-        return url;
-    }
-
     function onWebSocketMessage(e, data) {
 
         var msg = data;
@@ -883,14 +867,10 @@
 
         if (isDashboardPage) {
             refreshDashboardInfoInDrawer(page);
-            //mainDrawerPanel.forceNarrow = false;
         } else {
-
             if (navDrawerElement.classList.contains('adminDrawer')) {
                 refreshLibraryDrawer();
             }
-
-            //mainDrawerPanel.forceNarrow = true;
         }
 
         setDrawerClass(page);

dashboard-ui/scripts/livetvchannels.js

@@ -14,7 +14,8 @@
                     query: {
                         StartIndex: 0,
                         EnableFavoriteSorting: true,
-                        Limit: LibraryBrowser.getDefaultPageSize()
+                        Limit: LibraryBrowser.getDefaultPageSize(),
+                        Fields: "PrimaryImageAspectRatio"
                     }
                 };
 

dashboard-ui/scripts/livetvstatus.js

@@ -1,4 +1,4 @@
-define(['jQuery', 'listViewStyle'], function ($) {
+define(['jQuery', 'scripts/taskbutton', 'listViewStyle'], function ($, taskButton) {
 
     function resetTuner(page, id) {
 
@@ -595,10 +595,11 @@
         reload(page);
 
         // on here
-        $('.btnRefresh', page).taskButton({
+        taskButton({
             mode: 'on',
             progressElem: page.querySelector('.refreshGuideProgress'),
-            taskKey: 'RefreshGuide'
+            taskKey: 'RefreshGuide',
+            button: page.querySelector('.btnRefresh')
         });
 
     }).on('pagehide', "#liveTvStatusPage", function () {
@@ -606,8 +607,11 @@
         var page = this;
 
         // off here
-        $('.btnRefreshGuide', page).taskButton({
+        taskButton({
-            mode: 'off'
+            mode: 'off',
+            progressElem: page.querySelector('.refreshGuideProgress'),
+            taskKey: 'RefreshGuide',
+            button: page.querySelector('.btnRefresh')
         });
 
     });

dashboard-ui/scripts/medialibrarypage.js

@@ -1,4 +1,4 @@
-define(['jQuery', 'apphost', 'cardStyle'], function ($, appHost) {
+define(['jQuery', 'apphost', 'scripts/taskbutton', 'cardStyle'], function ($, appHost, taskButton) {
 
     function changeCollectionType(page, virtualFolder) {
 
@@ -461,10 +461,11 @@
         var page = this;
 
         // on here
-        $('.btnRefresh', page).taskButton({
+        taskButton({
             mode: 'on',
             progressElem: page.querySelector('.refreshProgress'),
-            taskKey: 'RefreshLibrary'
+            taskKey: 'RefreshLibrary',
+            button: page.querySelector('.btnRefresh')
         });
 
     });
@@ -474,8 +475,11 @@
         var page = this;
 
         // off here
-        $('.btnRefresh', page).taskButton({
+        taskButton({
-            mode: 'off'
+            mode: 'off',
+            progressElem: page.querySelector('.refreshProgress'),
+            taskKey: 'RefreshLibrary',
+            button: page.querySelector('.btnRefresh')
         });
 
     });

dashboard-ui/scripts/searchpage.js

@@ -191,14 +191,12 @@
 
         view.addEventListener('viewbeforeshow', function (e) {
             document.body.classList.add('hiddenViewMenuBar');
-            document.body.classList.add('hiddenNowPlayingBar');
             LibraryMenu.setMenuButtonVisible(false);
         });
 
         view.addEventListener('viewbeforehide', function (e) {
 
             document.body.classList.remove('hiddenViewMenuBar');
-            document.body.classList.remove('hiddenNowPlayingBar');
             LibraryMenu.setMenuButtonVisible(true);
         });
 

dashboard-ui/scripts/syncactivity.js

@@ -1,4 +1,4 @@
-define(['loading', 'apphost', 'globalize', 'syncJobList', 'events', 'localsync', 'emby-button', 'paper-icon-button-light'], function (loading, appHost, globalize, syncJobList, events) {
+define(['loading', 'apphost', 'globalize', 'syncJobList', 'events', 'scripts/taskbutton', 'localsync', 'emby-button', 'paper-icon-button-light'], function (loading, appHost, globalize, syncJobList, events, taskButton) {
 
     function getTabs() {
         return [
@@ -57,6 +57,22 @@
         view.addEventListener('viewshow', function () {
 
             LibraryMenu.setTabs('syncadmin', 0, getTabs);
+
+            taskButton({
+                mode: 'on',
+                progressElem: view.querySelector('.syncProgress'),
+                taskKey: 'SyncPrepare',
+                button: view.querySelector('.btnSync')
+            });
+        });
+
+        view.addEventListener('viewbeforehide', function () {
+
+            taskButton({
+                mode: 'off',
+                taskKey: 'SyncPrepare',
+                button: view.querySelector('.btnSync')
+            });
         });
 
         view.addEventListener('viewdestroy', function () {

dashboard-ui/scripts/taskbutton.js

@@ -1,21 +1,19 @@
-define(['appStorage', 'jQuery', 'emby-button'], function (appStorage, $) {
+define(['appStorage', 'emby-button'], function (appStorage) {
 
-    $.fn.taskButton = function (options) {
+    return function (options) {
 
-        function pollTasks(button) {
+        var button = options.button;
+
+        function pollTasks() {
 
             ApiClient.getScheduledTasks({
 
                 IsEnabled: true
 
-            }).then(function (tasks) {
+            }).then(updateTasks);
-
-                updateTasks(button, tasks);
-            });
-
         }
 
-        function updateTasks(button, tasks) {
+        function updateTasks(tasks) {
 
             var task = tasks.filter(function (t) {
 
@@ -36,12 +34,12 @@
             }
 
             if (task.State == 'Idle') {
-                $(button).removeAttr('disabled');
+                button.removeAttribute('disabled');
             } else {
-                $(button).attr('disabled', 'disabled');
+                button.setAttribute('disabled', 'disabled');
             }
 
-            $(button).attr('data-taskid', task.Id);
+            button.setAttribute('data-taskid', task.Id);
 
             var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
 
@@ -72,11 +70,8 @@
             }
         }
 
-        function onScheduledTaskMessageConfirmed(instance, id) {
+        function onScheduledTaskMessageConfirmed(id) {
-            ApiClient.startScheduledTask(id).then(function () {
+            ApiClient.startScheduledTask(id).then(pollTasks);
-
-                pollTasks(instance);
-            });
         }
 
         function onButtonClick() {
@@ -88,7 +83,7 @@
             var expectedValue = new Date().getMonth() + '6';
 
             if (appStorage.getItem(key) == expectedValue) {
-                onScheduledTaskMessageConfirmed(button, id);
+                onScheduledTaskMessageConfirmed(id);
             } else {
 
                 var msg = Globalize.translate('ConfirmMessageScheduledTaskButton');
@@ -107,7 +102,7 @@
 
                     }).then(function () {
                         appStorage.setItem(key, expectedValue);
-                        onScheduledTaskMessageConfirmed(button, id);
+                        onScheduledTaskMessageConfirmed(id);
                     });
 
                 });
@@ -123,17 +118,16 @@
 
                 var tasks = msg.Data;
 
-                updateTasks(self, tasks);
+                updateTasks(tasks);
             }
         }
 
-        var self = this;
         var pollInterval;
 
         function onPollIntervalFired() {
 
             if (!ApiClient.isWebSocketOpen()) {
-                pollTasks(self);
+                pollTasks();
             }
         }
 
@@ -162,23 +156,21 @@
 
         if (options.mode == 'off') {
 
-            this.off('click', onButtonClick);
+            button.removeEventListener('click', onButtonClick);
             Events.off(ApiClient, 'websocketmessage', onSocketMessage);
             Events.off(ApiClient, 'websocketopen', onSocketOpen);
             stopInterval();
 
-        } else if (this.length) {
+        } else  {
 
-            this.on('click', onButtonClick);
+            button.addEventListener('click', onButtonClick);
 
-            pollTasks(self);
+            pollTasks();
 
             startInterval();
 
             Events.on(ApiClient, 'websocketmessage', onSocketMessage);
             Events.on(ApiClient, 'websocketopen', onSocketOpen);
         }
-
-        return this;
     };
 });

dashboard-ui/syncactivity.html

@@ -1,5 +1,19 @@
 <div id="syncActivityPage" data-role="page" class="page type-interior syncConfigurationPage syncActivityPage withTabs fullWidthContent" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync">
 
+    <style>
+        .status-text-icon {
+            font-size: 94%;
+            background-color: #444;
+            display: inline-flex;
+            align-items: center;
+            text-align: center;
+            justify-content: center;
+        }
+
+        .zeroProgressStatus {
+            background-color: #444;
+        }
+    </style>
     <div data-role="content">
         <div class="content-primary">