mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

revert network share path changes

Browse source
This commit is contained in:
dkanada 2019-03-10 07:06:28 +09:00
parent 326d9f9adf
commit cd13be84fc
3 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/directorybrowser/directorybrowser.js
View file

@ -131,6 +131,14 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
if (!readOnlyAttribute) { if (!readOnlyAttribute) {
html += '<div class="results paperList" style="max-height: 200px; overflow-y: auto;"></div>'; html += '<div class="results paperList" style="max-height: 200px; overflow-y: auto;"></div>';
} }
if (options.enableNetworkSharePath) {
html += '<div class="inputContainer" style="margin-top:2em;">';
html += '<input is="emby-input" id="txtNetworkPath" type="text" label="' + Globalize.translate("LabelOptionalNetworkPath") + '"/>';
html += '<div class="fieldDescription">';
html += Globalize.translate("LabelOptionalNetworkPathHelp");
html += "</div>";
html += "</div>";
}
html += '<div class="formDialogFooter">'; html += '<div class="formDialogFooter">';
html += '<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">' + Globalize.translate("ButtonOk") + "</button>"; html += '<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">' + Globalize.translate("ButtonOk") + "</button>";
html += "</div>"; html += "</div>";
@ -211,8 +219,10 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
content.querySelector("form").addEventListener("submit", function(e) { content.querySelector("form").addEventListener("submit", function(e) {
if (options.callback) { if (options.callback) {
var networkSharePath = this.querySelector("#txtNetworkPath");
networkSharePath = networkSharePath ? networkSharePath.value : null;
var path = this.querySelector("#txtDirectoryPickerPath").value; var path = this.querySelector("#txtDirectoryPickerPath").value;
validatePath(path, options.validateWriteable, ApiClient).then(options.callback(path)); validatePath(path, options.validateWriteable, ApiClient).then(options.callback(path, networkSharePath));
} }
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -279,6 +289,10 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
}); });
currentDialog = dlg; currentDialog = dlg;
dlg.querySelector("#txtDirectoryPickerPath").value = initialPath; dlg.querySelector("#txtDirectoryPickerPath").value = initialPath;
var txtNetworkPath = dlg.querySelector("#txtNetworkPath");
if (txtNetworkPath) {
txtNetworkPath.value = options.networkSharePath || "";
}
if (!options.pathReadOnly) { if (!options.pathReadOnly) {
refreshDirectoryBrowser(dlg, initialPath, fileOptions, true); refreshDirectoryBrowser(dlg, initialPath, fileOptions, true);
} }

27
src/dashboard/dashboardgeneral.js
View file

@ -91,33 +91,20 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
var picker = new directoryBrowser(); var picker = new directoryBrowser();
picker.show({ picker.show({
path: $("#txtMetadataPath", view).val(), path: $("#txtMetadataPath", view).val(),
callback: function(path) { networkSharePath: $("#txtMetadataNetworkPath", view).val(),
callback: function(path, networkPath) {
if (path) { if (path) {
$("#txtMetadataPath", view).val(path); $("#txtMetadataPath", view).val(path);
} }
if (networkPath) {
$("#txtMetadataNetworkPath", view).val(networkPath));
}
picker.close(); picker.close();
}, },
validateWriteable: true, validateWriteable: true,
header: Globalize.translate("HeaderSelectMetadataPath"), header: Globalize.translate("HeaderSelectMetadataPath"),
instruction: Globalize.translate("HeaderSelectMetadataPathHelp") instruction: Globalize.translate("HeaderSelectMetadataPathHelp"),
}) enableNetworkSharePath: true
})
});
$("#btnSelectMetadataNetworkPath", view).on("click.selectDirectory", function() {
require(["directorybrowser"], function(directoryBrowser) {
var picker = new directoryBrowser();
picker.show({
path: $("#txtMetadataNetworkPath", view).val(),
callback: function(path) {
if (path) {
$("#txtMetadataNetworkPath", view).val(path);
}
picker.close();
},
validateWriteable: true,
header: Globalize.translate("LabelOptionalNetworkPath"),
instruction: Globalize.translate("LabelOptionalNetworkPathHelp")
}) })
}) })
}); });

11
src/dashboardgeneral.html
View file

@ -53,16 +53,7 @@
<button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><i class="md-icon">search</i></button> <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><i class="md-icon">search</i></button>
</div> </div>
<div class="fieldDescription">${LabelMetadataPathHelp}</div> <div class="fieldDescription">${LabelMetadataPathHelp}</div>
</div> <input type="hidden" id="txtMetadataNetworkPath" />
<div class="inputContainer">
<div style="display: flex; align-items: center;">
<div style="flex-grow:1;">
<input is="emby-input" id="txtMetadataNetworkPath" label="${LabelOptionalNetworkPath}" autocomplete="off" />
</div>
<button type="button" is="paper-icon-button-light" id="btnSelectMetadataNetworkPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><i class="md-icon">search</i></button>
</div>
<div class="fieldDescription">${LabelOptionalNetworkPathHelp}</div>
</div> </div>
</div> </div>