Merge branch 'master' into copy_url_firefox_fix

src/components/displaysettings/displaysettings.js

@@ -180,6 +180,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
 
         context.querySelector('#chkThemeSong').checked = userSettings.enableThemeSongs();
         context.querySelector('#chkThemeVideo').checked = userSettings.enableThemeVideos();
+        context.querySelector('#chkFadein').checked = userSettings.enableFastFadein();
         context.querySelector('#chkBackdrops').checked = userSettings.enableBackdrops();
 
         context.querySelector('#selectLanguage').value = userSettings.language() || '';
@@ -216,6 +217,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
 
         userSettingsInstance.skin(context.querySelector('.selectSkin').value);
 
+        userSettingsInstance.enableFastFadein(context.querySelector('#chkFadein').checked);
         userSettingsInstance.enableBackdrops(context.querySelector('#chkBackdrops').checked);
 
         if (user.Id === apiClient.getCurrentUserId()) {

src/components/displaysettings/displaysettings.template.html

@@ -3,6 +3,7 @@
     <h2 class="sectionTitle">
         ${Display}
     </h2>
+
     <div class="selectContainer languageSection hide">
         <select id="selectLanguage" is="emby-select" label="${LabelDisplayLanguage}">
             <option value="">${Auto}</option>
@@ -133,6 +134,7 @@
     <div class="selectContainer selectDashboardThemeContainer hide">
         <select id="selectDashboardTheme" is="emby-select" label="${LabelDashboardTheme}"></select>
     </div>
+
     <div class="selectContainer hide selectScreensaverContainer">
         <select is="emby-select" class="selectScreensaver" label="${LabelScreensaver}"></select>
     </div>
@@ -141,6 +143,14 @@
         <select is="emby-select" class="selectSoundEffects" label="${LabelSoundEffects}"></select>
     </div>
 
+    <div class="checkboxContainer checkboxContainer-withDescription fldFadein">
+        <label>
+            <input type="checkbox" is="emby-checkbox" id="chkFadein" />
+            <span>${EnableFastImageFadeIn}</span>
+        </label>
+        <div class="fieldDescription checkboxFieldDescription">${EnableFastImageFadeInHelp}</div>
+    </div>
+
     <div class="checkboxContainer checkboxContainer-withDescription fldBackdrops hide">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkBackdrops" />
@@ -148,6 +158,7 @@
         </label>
         <div class="fieldDescription checkboxFieldDescription">${EnableBackdropsHelp}</div>
     </div>
+
     <div class="checkboxContainer checkboxContainer-withDescription fldThemeSong hide">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkThemeSong" />
@@ -155,6 +166,7 @@
         </label>
         <div class="fieldDescription checkboxFieldDescription">${EnableThemeSongsHelp}</div>
     </div>
+
     <div class="checkboxContainer checkboxContainer-withDescription fldThemeVideo hide">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkThemeVideo" />

src/components/images/imageLoader.js

@@ -1,4 +1,4 @@
-define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', 'require', 'css!./style'], function (lazyLoader, imageFetcher, layoutManager, browser, appSettings, require) {
+define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', 'userSettings', 'require', 'css!./style'], function (lazyLoader, imageFetcher, layoutManager, browser, appSettings, userSettings, require) {
     'use strict';
 
     var requestIdleCallback = window.requestIdleCallback || function (fn) {
@@ -7,9 +7,6 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
 
     var self = {};
 
-    // seeing slow performance with firefox
-    var enableFade = false;
-
     function fillImage(elem, source, enableEffects) {
 
         if (!elem) {
@@ -30,7 +27,7 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
     function fillImageElement(elem, source, enableEffects) {
         imageFetcher.loadImage(elem, source).then(function () {
 
-            if (enableFade && enableEffects !== false) {
+            if (enableEffects !== false) {
                 fadeIn(elem);
             }
 
@@ -39,10 +36,11 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
     }
 
     function fadeIn(elem) {
-
+        if (userSettings.enableFastFadein()) {
-        var cssClass = 'lazy-image-fadein';
+            elem.classList.add('lazy-image-fadein-fast');
-
+        } else {
-        elem.classList.add(cssClass);
+            elem.classList.add('lazy-image-fadein');
+        }
     }
 
     function lazyChildren(elem) {

src/scripts/settings/userSettings.js

@@ -120,6 +120,15 @@ define(['appSettings', 'events'], function (appSettings, events) {
         return val !== 'false';
     };
 
+    UserSettings.prototype.enableFastFadein = function (val) {
+        if (val != null) {
+            return this.set('fastFadein', val.toString(), false);
+        }
+
+        val = this.get('fastFadein', false);
+        return val !== 'false';
+    };
+
     UserSettings.prototype.enableBackdrops = function (val) {
         if (val != null) {
             return this.set('enableBackdrops', val.toString(), false);

src/strings/en-gb.json

@@ -836,6 +836,8 @@
     "LabelSecureConnectionsMode": "Secure connection mode:",
     "LabelSeasonNumber": "Season number:",
     "LabelScreensaver": "Screensaver:",
+    "EnableFastImageFadeIn": "Fast image fade-in",
+    "EnableFastImageFadeInHelp": "Enable faster fade-in animation for loaded images",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "LabelSaveLocalMetadataHelp": "Saving artwork into media folders will put them in a place where they can be easily edited.",
     "LabelRuntimeMinutes": "Run time (minutes):",

src/strings/en-us.json

@@ -794,6 +794,8 @@
     "LabelSaveLocalMetadataHelp": "Saving artwork into media folders will put them in a place where they can be easily edited.",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "LabelScreensaver": "Screensaver:",
+    "EnableFastImageFadeIn": "Fast image fade-in",
+    "EnableFastImageFadeInHelp": "Enable faster fade-in animation for loaded images",
     "LabelSeasonNumber": "Season number:",
     "LabelSecureConnectionsMode": "Secure connection mode:",
     "LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:",

src/strings/it.json

@@ -595,7 +595,7 @@
     "LabelIconMaxHeight": "Altezza icona massima:",
     "LabelIconMaxHeightHelp": "Risoluzione massima delle icone inviate tramite upnp:icon.",
     "LabelIconMaxWidth": "Larghezza massima icona:",
-    "LabelIconMaxWidthHelp": "Risoluzione massima delle icone inviate tramite upnp:icon.",
+    "LabelIconMaxWidthHelp": "Risoluzione massima delle icone esposte tramite upnp:icon.",
     "LabelIdentificationFieldHelp": "Una stringa o espressione regex sensibile a maiuscole e minuscole.",
     "LabelImageFetchersHelp": "Abilitare e classificare i tuoi Fetchers immagini preferite in ordine di priorità.",
     "LabelImageType": "Tipo immagine:",
@@ -607,7 +607,7 @@
     "LabelKidsCategories": "Categorie bambini:",
     "LabelKodiMetadataDateFormat": "Data di uscita Formato:",
     "LabelKodiMetadataDateFormatHelp": "Tutte le date all'interno dei files NFO verranno analizzate utilizzando questo formato.",
-    "LabelKodiMetadataEnableExtraThumbs": "Copia extrafanart in extrathumbs",
+    "LabelKodiMetadataEnableExtraThumbs": "Copia extrafanart nel campo extrathumbs",
     "LabelKodiMetadataEnableExtraThumbsHelp": "Copia extrafanart in extrathumbs",
     "LabelKodiMetadataEnablePathSubstitution": "Abilita sostituzione di percorso",
     "LabelKodiMetadataEnablePathSubstitutionHelp": "Consente percorso sostituzione dei percorsi delle immagini utilizzando le impostazioni di sostituzione percorso del server.",
@@ -1456,5 +1456,7 @@
     "OptionRandom": "Casuale",
     "MessageConfirmAppExit": "Vuoi uscire?",
     "HeaderNavigation": "Navigazione",
-    "CopyStreamURLError": "Si è verificato un errore nel copiare l'indirizzo."
+    "CopyStreamURLError": "Si è verificato un errore nel copiare l'indirizzo.",
+    "EnableFastImageFadeInHelp": "Abilita la dissolvenza veloce per le immagini caricate",
+    "EnableFastImageFadeIn": "Dissolvenza immagine veloce"
 }

src/strings/nb.json

@@ -1454,5 +1454,9 @@
     "Raised": "Hevet",
     "ButtonSplit": "Del opp",
     "SelectAdminUsername": "Vennligst velg et brukernavn for administrator-kontoen.",
-    "HeaderNavigation": "Navigering"
+    "HeaderNavigation": "Navigering",
+    "MessageConfirmAppExit": "Vil du avslutte?",
+    "EnableFastImageFadeInHelp": "Bruk rask inntoning av animasjon for lastede bilder",
+    "EnableFastImageFadeIn": "Rask bilde inntoning",
+    "CopyStreamURLError": "Det var en feil under kopiering av URL'en."
 }

src/strings/zh-cn.json

@@ -1459,5 +1459,6 @@
     "OptionRandom": "随机",
     "ButtonSplit": "拆分",
     "SelectAdminUsername": "请为管理员账户选择一个用户名。",
-    "HeaderNavigation": "导航"
+    "HeaderNavigation": "导航",
+    "CopyStreamURLError": "复制URL地址时发生错误。"
 }