Fixed rebase conflicts.

pymedusa · Jun 1, 2019 · 096e3a7 · 096e3a7
1 parent d489722
commit 096e3a7
Show file tree

Hide file tree

Showing 12 changed files with 895 additions and 1,061 deletions.
diff --git a/themes-default/slim/package.json b/themes-default/slim/package.json
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "axios": "0.18.0",
+    "axios": "0.19.0",
     "country-language": "0.1.7",
     "date-fns": "1.30.1",
     "lodash": "4.17.11",
@@ -42,7 +42,6 @@
     "@babel/preset-env": "7.4.5",
     "@mapbox/stylelint-processor-arbitrary-tags": "0.2.0",
     "@vue/test-utils": "1.0.0-beta.29",
-    "axios": "0.19.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-loader": "8.0.6",

diff --git a/themes-default/slim/src/components/show-header.vue b/themes-default/slim/src/components/show-header.vue
@@ -349,7 +349,8 @@ export default {
         }),
         ...mapGetters({
             show: 'getCurrentShow',
-            getPreset: 'getPreset'
+            getPreset: 'getPreset',
+            getOverviewStatus: 'getOverviewStatus'
         }),
         indexer() {
             return this.showIndexer || this.$route.query.indexername;
@@ -473,25 +474,22 @@ export default {
             return combineQualities(allowed, preferred);
         }
     },
-    methods: {
-        combineQualities,
-        humanFileSize,
-        setQuality(quality, showSlug, episodes) {
-            const patchData = {};
-            episodes.forEach(episode => {
-                patchData[episode] = { quality: parseInt(quality, 10) };
+    mounted() {
+        ['load', 'resize'].map(event => {
+            return window.addEventListener(event, () => {
+                this.reflowLayout();
             });
         });
-
         this.$watch('show', function(slug) { // eslint-disable-line object-shorthand
             // Show has changed. Meaning we should reflow the layout.
             if (slug) {
                 const { reflowLayout } = this;
                 this.$nextTick(() => reflowLayout());
             }
         }, { deep: true });
-        },
+    },
     methods: {
+        combineQualities,
         humanFileSize,
         changeStatusClicked() {
             const { changeStatusOptions, changeQualityOptions, selectedStatus, selectedQuality } = this;

diff --git a/themes-default/slim/src/router.js b/themes-default/slim/src/router.js
@@ -97,7 +97,7 @@ const homeRoutes = [{
         topMenu: 'home',
         subMenu: showSubMenu
     },
-    component: () => import('./components/display-show.vue');
+    component: () => import('./components/display-show.vue')
 }, {
     path: '/home/snatchSelection',
     name: 'snatchSelection',

diff --git a/themes-default/slim/src/store/modules/config.js b/themes-default/slim/src/store/modules/config.js
@@ -259,7 +259,7 @@ const getters = {
         } else {
             return arrayExclude(globalRequired, seriesRequired);
         }
-    }
+    },
     // Get an indexer's name using its ID.
     indexerIdToName: state => indexerId => {
         if (!indexerId) {

diff --git a/themes-default/slim/src/utils.js b/themes-default/slim/src/utils.js
@@ -6,6 +6,7 @@ export const isDevelopment = process.env.NODE_ENV === 'development';
  * @param {number[]} [preferredQualities=[]] - Array of preferred qualities.
  * @returns {number} An unsigned integer.
  */
+
 export const combineQualities = (allowedQualities, preferredQualities = []) => {
     const reducer = (accumulator, currentValue) => accumulator | currentValue;
     const allowed = allowedQualities.reduce(reducer, 0);