milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update startup wizard

Browse source
This commit is contained in:
Luke Pulverenti 2016-06-23 13:04:18 -04:00
parent 681639cc95
commit b4c8cb07c9
16 changed files with 256 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dashboard-ui/scripts/encodingsettings.js
View file

@ -13,6 +13,20 @@
Dashboard.hideLoadingMsg();
}
function onSaveEncodingPathFailure(response) {
Dashboard.hideLoadingMsg();
var msg = '';
// This is a fallback that handles both 404 and 400 (no path entered)
msg = Globalize.translate('FFmpegSavePathNotFound');
require(['alert'], function (alert) {
alert(msg);
});
}
function onSubmit() {
var form = this;
@ -24,13 +38,22 @@
config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
config.EncoderAppPath = $('.txtEncoderPath', form).val();
config.EncodingThreadCount = $('#selectThreadCount', form).val();
config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
config.EnableThrottling = form.querySelector('#chkEnableThrottle').checked;
ApiClient.updateNamedConfiguration("encoding", config).then(Dashboard.processServerConfigurationUpdateResult);
ApiClient.updateNamedConfiguration("encoding", config).then(function () {
ApiClient.ajax({
url: ApiClient.getUrl('System/MediaEncoder/Path'),
type: 'POST',
data: {
Path: form.querySelector('.txtEncoderPath').value
}
}).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure);
});
});
};
@ -80,12 +103,11 @@
require(['directorybrowser'], function (directoryBrowser) {
var picker = new directoryBrowser({
includeFiles: true
});
var picker = new directoryBrowser();
picker.show({
includeFiles: true,
callback: function (path) {
if (path) {

7
dashboard-ui/scripts/librarybrowser.js
View file

@ -981,9 +981,12 @@
identifyItem: function (itemId) {
require(['components/itemidentifier/itemidentifier'], function (itemidentifier) {
return new Promise(function (resolve, reject) {
itemidentifier.show(itemId);
require(['components/itemidentifier/itemidentifier'], function (itemidentifier) {
itemidentifier.show(itemId).then(resolve, reject);
});
});
},

2
dashboard-ui/scripts/librarymenu.js
View file

@ -27,7 +27,7 @@
html += '<button type="button" is="paper-icon-button-light" class=headerButton headerButtonRight headerSearchButton hide autoSize" onclick="Search.showSearchPanel();"><i class="md-icon">search</i></button>';
html += '<div class="viewMenuSearch hide">';
html += '<form class="viewMenuSearchForm">';
html += '<input type="text" data-role="none" data-type="search" class="headerSearchInput" autocomplete="off" spellcheck="off" />';
html += '<input type="text" class="headerSearchInput" autocomplete="off" />';
html += '<button type="button" is="paper-icon-button-light" class="btnCloseSearch autoSize"><i class="md-icon">close</i></button>';
html += '</form>';
html += '</div>';

8
dashboard-ui/scripts/search.js
View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'events', 'scrollStyles'], function (libraryBrowser, events) {
define(['libraryBrowser', 'events', 'scrollStyles', 'scripts/librarymenu'], function (libraryBrowser, events) {
var searchHintTimeout;
@ -233,7 +233,6 @@
require(['searchmenu'], function (searchmenu) {
events.on(window.SearchMenu, 'closed', closeSearchResults);
events.on(window.SearchMenu, 'change', function (e, value) {
onHeaderSearchChange(value);
});
});
@ -259,10 +258,7 @@
document.addEventListener('viewbeforehide', closeSearchResults);
document.addEventListener('headercreated', function () {
bindSearchEvents();
});
bindSearchEvents();
// dismiss search UI if user clicks a play button on a search result
events.on(MediaController, 'beforeplaybackstart', closeSearchResults);

25
dashboard-ui/scripts/searchmenu.js
View file

@ -12,12 +12,13 @@
function searchMenu() {
var self = this;
var headerSearchInput = document.querySelector('.headerSearchInput');
self.show = function () {
require(['css!css/search.css'], function () {
document.querySelector('.headerSearchInput').value = '';
headerSearchInput.value = '';
document.querySelector('.btnCloseSearch').classList.add('hide');
var elem = document.querySelector('.viewMenuSearch');
@ -25,7 +26,7 @@
elem.classList.remove('hide');
var onFinish = function() {
document.querySelector('.headerSearchInput').focus();
headerSearchInput.focus();
document.querySelector('.btnCloseSearch').classList.remove('hide');
};
@ -62,24 +63,8 @@
Events.trigger(self, 'closed');
});
document.querySelector('.headerSearchInput').addEventListener('keyup', function (e) {
// Down key
if (e.keyCode == 40) {
e.preventDefault();
return false;
} else {
Events.trigger(self, 'change', [this.value]);
}
});
document.querySelector('.headerSearchInput').addEventListener('search', function (e) {
if (!this.value) {
Events.trigger(self, 'change', ['']);
}
headerSearchInput.addEventListener('input', function (e) {
Events.trigger(self, 'change', [this.value]);
});
}

8
dashboard-ui/scripts/site.js
View file

@ -3019,6 +3019,14 @@ var AppInfo = {};
anonymous: true
});
defineRoute({
path: '/wizardcomponents.html',
dependencies: ['dashboardcss', 'emby-button', 'emby-input'],
autoFocus: false,
anonymous: true,
controller: 'scripts/wizardcomponents'
});
defineRoute({
path: '/wizardfinish.html',
dependencies: ['emby-button', 'dashboardcss'],

88
dashboard-ui/scripts/wizardcomponents.js Normal file
View file

@ -0,0 +1,88 @@
define([], function () {
function goNext() {
require(['scripts/wizardcontroller'], function (wizardcontroller) {
wizardcontroller.navigateToService();
});
}
function loadDownloadInfo(view) {
ApiClient.getSystemInfo().then(function (systemInfo) {
if (systemInfo.OperatingSystem == 'Windows' && systemInfo.SystemArchitecture != 'Arm') {
view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="https://ffmpeg.zeranoe.com/builds">https://ffmpeg.zeranoe.com</a>');
var instructions = '';
if (systemInfo.SystemArchitecture == 'X86') {
instructions = 'Download 32-Bit Static';
}
else if (systemInfo.SystemArchitecture == 'X64') {
instructions = 'Download 64-Bit Static';
}
view.querySelector('.downloadInstructions').innerHTML = instructions;
} else {
view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://ffmpeg.org">http://ffmpeg.org</a>');
view.querySelector('.downloadInstructions').innerHTML = '';
}
});
}
function onSaveEncodingPathFailure(response) {
var msg = '';
// This is a fallback that handles both 404 and 400 (no path entered)
msg = Globalize.translate('FFmpegSavePathNotFound');
require(['alert'], function (alert) {
alert(msg);
});
}
return function (view, params) {
view.querySelector('#btnSelectEncoderPath').addEventListener("click", function () {
require(['directorybrowser'], function (directoryBrowser) {
var picker = new directoryBrowser();
picker.show({
includeFiles: true,
callback: function (path) {
if (path) {
view.querySelector('.txtEncoderPath').value = path;
}
picker.close();
}
});
});
});
view.querySelector('form').addEventListener('submit', function (e) {
var form = this;
ApiClient.ajax({
url: ApiClient.getUrl('System/MediaEncoder/Path'),
type: 'POST',
data: {
Path: form.querySelector('.txtEncoderPath').value
}
}).then(goNext, onSaveEncodingPathFailure);
e.preventDefault();
return false;
});
view.addEventListener('viewbeforeshow', function (e) {
loadDownloadInfo(view);
});
};
});

35
dashboard-ui/scripts/wizardcontroller.js Normal file
View file

@ -0,0 +1,35 @@
define([], function () {
function navigateToComponents() {
var apiClient = ApiClient;
apiClient.getJSON(apiClient.getUrl('Startup/Info')).then(function (info) {
if (info.HasMediaEncoder) {
navigateToService();
} else {
Dashboard.navigate('wizardcomponents.html');
}
});
}
function navigateToService() {
var apiClient = ApiClient;
apiClient.getJSON(apiClient.getUrl('Startup/Info')).then(function (info) {
if (info.SupportsRunningAsService) {
Dashboard.navigate('wizardservice.html');
} else {
Dashboard.navigate('wizardagreement.html');
}
});
}
return {
navigateToComponents: navigateToComponents,
navigateToService: navigateToService
};
});

13
dashboard-ui/scripts/wizardlivetvguide.js
View file

@ -56,17 +56,8 @@
}
function skip() {
var apiClient = ApiClient;
apiClient.getJSON(apiClient.getUrl('Startup/Info')).then(function (info) {
if (info.SupportsRunningAsService) {
Dashboard.navigate('wizardservice.html');
} else {
Dashboard.navigate('wizardagreement.html');
}
require(['scripts/wizardcontroller'], function (wizardcontroller) {
wizardcontroller.navigateToComponents();
});
}

12
dashboard-ui/scripts/wizardlivetvtuner.js
View file

@ -60,16 +60,8 @@
}
function skip() {
var apiClient = ApiClient;
apiClient.getJSON(apiClient.getUrl('Startup/Info')).then(function (info) {
if (info.SupportsRunningAsService) {
Dashboard.navigate('wizardservice.html');
} else {
Dashboard.navigate('wizardagreement.html');
}
require(['scripts/wizardcontroller'], function (wizardcontroller) {
wizardcontroller.navigateToComponents();
});
}