update strings

MediaBrowser · Feb 26, 2020 · 713fd41 · 713fd41
1 parent 799f79d
commit 713fd41
Show file tree

Hide file tree

Showing 31 changed files with 121 additions and 665 deletions.
diff --git a/alert/alert.js b/alert/alert.js
@@ -16,7 +16,7 @@ define(['dialog', 'globalize'], function (dialog, globalize) {
         var items = [];
 
         items.push({
-            name: globalize.translate('ButtonGotIt'),
+            name: options.confirmText || globalize.translate('ButtonGotIt'),
             id: 'ok',
             type: 'submit'
         });

diff --git a/deletehelper.js b/deletehelper.js
@@ -39,7 +39,7 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con
 
             }).then(function () {
 
-                return ApiClient.uninstallPlugin(item.Id).then(function () {
+                return apiClient.uninstallPlugin(item.Id).then(function () {
 
                     return onItemDeleted(options);
                 });
@@ -63,7 +63,7 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con
 
             }).then(function () {
 
-                return ApiClient.deleteUser(item.Id).then(function () {
+                return apiClient.deleteUser(item.Id).then(function () {
 
                     return onItemDeleted(options);
                 });

diff --git a/dialog/dialog.js b/dialog/dialog.js
@@ -52,6 +52,10 @@ define(['dialogHelper', 'dom', 'layoutManager', 'globalize', 'require', 'materia
 
             dlg.querySelector('.text').innerHTML = options.html;
 
+        } else if (options.preFormattedText) {
+
+            dlg.querySelector('.text').innerHTML = '<pre style="text-align:left;font-size:inherit;white-space:pre-wrap;">' + options.preFormattedText+'</pre>';
+
         } else if (options.text) {
 
             dlg.querySelector('.text').innerText = replaceAll(options.text || '', '<br/>', '\n');

diff --git a/dialog/dialog.template.html b/dialog/dialog.template.html
@@ -1,17 +1,14 @@
 <div class="formDialogHeader formDialogHeader-clear justify-content-center">
-    <h1 class="formDialogHeaderTitle" style="margin-left:0;margin-top: .5em;padding: 0 1em;"></h1>
+    <h3 class="formDialogHeaderTitle" style="margin-left:0;margin-top: .5em;padding: 0 1em;"></h3>
 </div>
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
-    <div class="scrollSlider">
-        <div class="dialogContentInner dialog-content-centered" style="padding-top:1em;padding-bottom: 1em; text-align: center;">
+    <div class="scrollSlider dialogContentInner dialog-content-centered padded-left padded-right">
+        <div class="text">
 
-            <div class="text">
-
-            </div>
         </div>
     </div>
 </div>
 
-<div class="formDialogFooter formDialogFooter-clear formDialogFooter-flex" style="padding-bottom: 1.5em;">
+<div class="formDialogFooter formDialogFooter-clear formDialogFooter-flex">
 </div>
diff --git a/dom.js b/dom.js
@@ -184,6 +184,58 @@ define([], function () {
 
         return supportsCaptureOption;
     }
+    function removeAttributes(elem) {
+        var whitelist = [];
+
+        var attributes = elem.attributes;
+        var i = attributes.length;
+        while (i--) {
+            var attr = attributes[i];
+            if (whitelist.indexOf(attr.name) === -1) {
+                elem.removeAttributeNode(attr);
+            }
+        }
+    }
+
+    function stripScriptsWithDom(s) {
+        var div = document.createElement('div');
+        div.innerHTML = s;
+        var scripts = div.getElementsByTagName('script');
+        var i = scripts.length;
+        while (i--) {
+            scripts[i].parentNode.removeChild(scripts[i]);
+        }
+
+        var elems = div.getElementsByTagName("*");
+        var length;
+
+        for (i = 0, length = elems.length; i < length; i++) {
+            //Remove all onmouseover, onmouseout, onclick eventhandlers from element           
+            var elem = elems[i];
+
+            removeAttributes(elem);
+
+            if (elem.tagName === "A") {
+
+                //if the href values of the link tags start with javascript:  then set href="#""
+                if (elem.href.indexOf('javascript') === 0) {
+                    elem.setAttribute("href", "#");
+                }
+            }
+        }
+
+        return div.innerHTML;
+    }
+
+    function stripScripts(s) {
+
+        try {
+            return stripScriptsWithDom(s);
+        }
+        catch (err) {
+            return htmlEncode(s);
+        }
+    }
 
     return {
         parentWithAttribute: parentWithAttribute,
@@ -196,6 +248,7 @@ define([], function () {
         whichAnimationEvent: whichAnimationEvent,
         whichAnimationCancelEvent: whichAnimationCancelEvent,
         htmlEncode: htmlEncode,
-        supportsEventListenerOnce: supportsEventListenerOnce
+        supportsEventListenerOnce: supportsEventListenerOnce,
+        stripScripts: stripScripts
     };
 });
diff --git a/filtermenu/filtermenu.template.html b/filtermenu/filtermenu.template.html
@@ -1,6 +1,6 @@
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <form class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
+        <form class="dialogContentInner dialog-content-centered padded-left padded-right" style="padding-top:2em;">
 
 
             <div class="checkboxContainer simpleFilter viewSetting" data-settingname="IsFavorite">

diff --git a/formdialog.css b/formdialog.css
@@ -2,6 +2,7 @@
     display: flex;
     flex-direction: column;
     position: relative;
+    max-height: 100%;
 }
 
 .formDialogHeader {
@@ -23,11 +24,8 @@
 }
 
 .dialogContentInner {
-    padding: .5em 1em 14em 1em;
-}
-
-.dialogContentInner-mini {
-    padding-bottom: 10em;
+    padding-top: 1em;
+    padding-bottom: 1em;
 }
 
 .dialog-content-centered {
@@ -103,21 +101,11 @@
     .formDialogFooterItem {
         max-width: 80%;
     }
-
-    .dialogContentInner {
-        padding-left: 1.5em;
-        padding-right: 1.5em;
-    }
 }
 
 @media all and (min-width: 80em) {
 
     .formDialogFooterItem {
         max-width: 70%;
     }
-
-    .dialogContentInner {
-        padding-left: 2em;
-        padding-right: 2em;
-    }
 }
diff --git a/imagedownloader/imagedownloader.template.html b/imagedownloader/imagedownloader.template.html
@@ -7,7 +7,7 @@ <h3 class="formDialogHeaderTitle">
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <div class="dialogContentInner">
+        <div class="dialogContentInner padded-left padded-right">
             <div class="flex align-items-center justify-content-center flex-wrap-wrap" style="margin: 2em 0;">
 
                 <div class="selectContainer">

diff --git a/imageeditor/imageeditor.template.html b/imageeditor/imageeditor.template.html
@@ -7,7 +7,7 @@ <h3 class="formDialogHeaderTitle">
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <div class="dialogContentInner">
+        <div class="dialogContentInner padded-left padded-right">
 
             <div id="imagesContainer" class="verticalSection">
 

diff --git a/imageuploader/imageuploader.template.html b/imageuploader/imageuploader.template.html
@@ -7,7 +7,7 @@ <h3 class="formDialogHeaderTitle">
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <form class="dialogContentInner uploadItemImageForm" style="max-width: 100%;">
+        <form class="dialogContentInner uploadItemImageForm padded-left padded-right" style="max-width: 100%;">
 
             <div class="flex align-items-center" style="margin:1.5em 0;">
                 <h2 style="margin:0;">${HeaderAddUpdateImage}</h2>

diff --git a/itemcontextmenu.js b/itemcontextmenu.js
@@ -718,7 +718,7 @@ define(['dom', 'userSettings', 'apphost', 'globalize', 'connectionManager', 'ite
 
                 var refreshAfterChange = dom.parentWithClass(button, 'page').getAttribute('data-refreshlibrary') === 'true';
 
-                return ApiClient.removeVirtualFolder(virtualFolder, refreshAfterChange);
+                return apiClient.removeVirtualFolder(virtualFolder, refreshAfterChange);
             });
         });
     }
@@ -740,7 +740,7 @@ define(['dom', 'userSettings', 'apphost', 'globalize', 'connectionManager', 'ite
 
                     var refreshAfterChange = dom.parentWithClass(button, 'page').getAttribute('data-refreshlibrary') === 'true';
 
-                    return ApiClient.renameVirtualFolder(virtualFolder, newName, refreshAfterChange);
+                    return apiClient.renameVirtualFolder(virtualFolder, newName, refreshAfterChange);
                 }
             });
 

diff --git a/itemidentifier/itemidentifier.template.html b/itemidentifier/itemidentifier.template.html
@@ -7,7 +7,7 @@ <h3 class="formDialogHeaderTitle">
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <div class="dialogContentInner dialog-content-centered">
+        <div class="dialogContentInner dialog-content-centered padded-left padded-right">
             <form class="popupIdentifyForm" style="margin:auto;">
 
                 <p>${HeaderIdentifyItemHelp}</p>

diff --git a/metadataeditor/metadataeditor.template.html b/metadataeditor/metadataeditor.template.html
@@ -16,7 +16,7 @@ <h3 class="formDialogHeaderTitle">
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <form class="editItemMetadataForm editMetadataForm dialogContentInner dialog-content-centered" style="padding-top:2em;">
+        <form class="editItemMetadataForm editMetadataForm dialogContentInner dialog-content-centered padded-left padded-right" style="padding-top:2em;">
             <div class="metadataFormFields">
 
                 <div style="padding: 0 0 10px;">

diff --git a/metadataeditor/personeditor.template.html b/metadataeditor/personeditor.template.html
@@ -7,7 +7,7 @@ <h3 class="formDialogHeaderTitle">
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <form class="popupEditPersonForm dialogContentInner dialog-content-centered" style="padding-top:2em;">
+        <form class="popupEditPersonForm dialogContentInner dialog-content-centered padded-left padded-right" style="padding-top:2em;">
 
             <div class="inputContainer">
                 <input type="text" is="emby-input" class="txtPersonName" required="required" label="${LabelName}" />

diff --git a/nowplayingbar/nowplayingbar.css b/nowplayingbar/nowplayingbar.css
@@ -57,7 +57,7 @@
     flex-grow: 1;
     font-size: 92%;
     margin-right: 2.4em;
-    margin-left: 1em;
+    margin-left: .25em;
 }
 
 .nowPlayingBarCenter {

diff --git a/playback/playbackmanager.js b/playback/playbackmanager.js
@@ -385,27 +385,9 @@
 
         var maxValues = getAudioMaxValues(deviceProfile);
 
-        var streamUrls = [];
-
         var enableRemoteMedia = apphost.supports('remoteaudio');
 
-        for (var i = 0, length = items.length; i < length; i++) {
-
-            var item = items[i];
-            var streamUrl;
-
-            if (item.MediaType === 'Audio') {
-                streamUrl = apiClient.getAudioStreamUrl(item, audioTranscodingProfile, audioDirectPlayContainers, maxValues.maxAudioBitrate || maxBitrate, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, startPosition, enableRemoteMedia);
-            }
-
-            streamUrls.push(streamUrl || '');
-
-            if (i === 0) {
-                startPosition = 0;
-            }
-        }
-
-        return Promise.resolve(streamUrls);
+        return apiClient.getAudioStreamUrls(items, audioTranscodingProfile, audioDirectPlayContainers, maxValues.maxAudioBitrate || maxBitrate, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, startPosition, enableRemoteMedia);
     }
 
     function setStreamUrlIntoAllMediaSources(mediaSources, streamUrl) {

diff --git a/pluginmanager.js b/pluginmanager.js
@@ -1,4 +1,4 @@
-define(['events'], function (events) {
+define(['events', 'apphost', 'connectionManager'], function (events, appHost, connectionManager) {
     'use strict';
 
     // TODO: replace with each plugin version
@@ -249,5 +249,32 @@ define(['events'], function (events) {
         return !disallowPlugins;
     };
 
+    PluginManager.prototype.getConfigurationPageUrl = function (name) {
+
+        if (appHost.supports('multiserver')) {
+
+            return "configurationpageext?name=" + encodeURIComponent(name);
+
+        } else {
+
+            return "configurationpage?name=" + encodeURIComponent(name);
+        }
+    };
+
+    PluginManager.prototype.getConfigurationResourceUrl = function (name) {
+
+        if (appHost.supports('multiserver')) {
+
+            return connectionManager.currentApiClient().getUrl('web/ConfigurationPage',
+                {
+                    name: name
+                });
+
+        } else {
+
+            return this.getConfigurationPageUrl(name);
+        }
+    };
+
     return new PluginManager();
 });
diff --git a/prompt/prompt.js b/prompt/prompt.js
@@ -31,7 +31,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'dom', 'require', 'materia
 
         if (layoutManager.tv) {
         } else {
-            dlg.querySelector('.dialogContentInner').classList.add('dialogContentInner-mini');
+            dlg.querySelector('.dialogContentInner').style['padding-bottom'] = '10em';
             dlg.classList.add('dialog-fullscreen-lowres');
         }
 

diff --git a/prompt/prompt.template.html b/prompt/prompt.template.html
@@ -7,7 +7,7 @@ <h3 class="formDialogHeaderTitle"></h3>
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <form class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
+        <form class="dialogContentInner dialog-content-centered padded-left padded-right" style="padding-top:2em;">
             <div class="inputContainer">
                 <input is="emby-input" type="text" id="txtInput" label="" required="required" />
                 <div class="fieldDescription"></div>

diff --git a/recordingcreator/recordingcreator.template.html b/recordingcreator/recordingcreator.template.html
@@ -5,7 +5,7 @@ <h3 class="formDialogHeaderTitle"></h3>
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <form class="dialogContentInner dialog-content-centered">
+        <form class="dialogContentInner dialog-content-centered padded-left padded-right">
             <div class="recordingDetailsContainer">
                 <div class="recordingDialog-imageContainer">
 

diff --git a/recordingcreator/recordingeditor.template.html b/recordingcreator/recordingeditor.template.html
@@ -7,7 +7,7 @@ <h3 class="formDialogHeaderTitle">
 
 <div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">
     <div class="scrollSlider">
-        <form class="dialogContentInner dialog-content-centered">
+        <form class="dialogContentInner dialog-content-centered padded-left padded-right">
             <br />
             <div class="inputContainer">
                 <div class="flex align-items-center">

diff --git a/refreshdialog/refreshdialog.js b/refreshdialog/refreshdialog.js
@@ -20,7 +20,7 @@
 
         html += '<div is="emby-scroller" data-horizontal="false" data-centerfocus="card" class="formDialogContent">';
         html += '<div class="scrollSlider">';
-        html += '<form class="dialogContentInner dialog-content-centered" style="padding-top:2em;">';
+        html += '<form class="dialogContentInner dialog-content-centered padded-left padded-right" style="padding-top:2em;">';
 
         html += '<div class="fldSelectPlaylist selectContainer">';
         html += '<select is="emby-select" id="selectMetadataRefreshMode" label="' + globalize.translate('LabelRefreshMode') + '">';