alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

upgrade to jquery mobile 1.4.5

Browse Source
This commit is contained in:
Luke Pulverenti
2014-11-02 22:38:43 -05:00
parent 7a4d5b7951
commit 7ca1cd8795
25 changed files with 735 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@@ -559,7 +559,7 @@ namespace MediaBrowser.ServerApplication
var authContext = new AuthorizationContext();
RegisterSingleInstance<IAuthorizationContext>(authContext);
RegisterSingleInstance<ISessionContext>(new SessionContext(UserManager, authContext, SessionManager));
RegisterSingleInstance<IAuthService>(new AuthService(UserManager, SessionManager, authContext, ServerConfigurationManager));
RegisterSingleInstance<IAuthService>(new AuthService(UserManager, SessionManager, authContext, ServerConfigurationManager, ConnectManager));
RegisterSingleInstance<ISubtitleEncoder>(new SubtitleEncoder(LibraryManager, LogManager.GetLogger("SubtitleEncoder"), ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer));

16
MediaBrowser.ServerApplication/EntryPoints/StartupWizard.cs
View File

@@ -1,10 +1,7 @@
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Plugins;
using MediaBrowser.Model.Logging;
using MediaBrowser.ServerApplication.Native;
using System.Linq;
namespace MediaBrowser.ServerApplication.EntryPoints
{
@@ -20,22 +17,17 @@ namespace MediaBrowser.ServerApplication.EntryPoints
/// <summary>
/// The _user manager
/// </summary>
private readonly IUserManager _userManager;
private readonly ILogger _logger;
private readonly IServerConfigurationManager _configurationManager;
/// <summary>
/// Initializes a new instance of the <see cref="StartupWizard" /> class.
/// </summary>
/// <param name="appHost">The app host.</param>
/// <param name="userManager">The user manager.</param>
public StartupWizard(IServerApplicationHost appHost, IUserManager userManager, IServerConfigurationManager configurationManager, ILogger logger)
/// <param name="logger">The logger.</param>
public StartupWizard(IServerApplicationHost appHost, ILogger logger)
{
_appHost = appHost;
_logger = logger;
_userManager = userManager;
_configurationManager = configurationManager;
}
/// <summary>
@@ -54,9 +46,7 @@ namespace MediaBrowser.ServerApplication.EntryPoints
/// </summary>
private void LaunchStartupWizard()
{
var user = _userManager.Users.FirstOrDefault(u => u.Configuration.IsAdministrator);
BrowserLauncher.OpenDashboardPage("wizardstart.html", user, _configurationManager, _appHost, _logger);
BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost, _logger);
}
/// <summary>

2
MediaBrowser.ServerApplication/MainStartup.cs
View File

@@ -300,7 +300,7 @@ namespace MediaBrowser.ServerApplication
{
if (e.Reason == SessionSwitchReason.SessionLogon)
{
BrowserLauncher.OpenDashboard(_appHost.UserManager, _appHost.ServerConfigurationManager, _appHost, _logger);
BrowserLauncher.OpenDashboard(_appHost, _logger);
}
}

29
MediaBrowser.ServerApplication/Native/BrowserLauncher.cs
View File

@@ -1,11 +1,7 @@
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using System;
using System.Diagnostics;
using System.Linq;
namespace MediaBrowser.ServerApplication.Native
{
@@ -18,13 +14,11 @@ namespace MediaBrowser.ServerApplication.Native
/// Opens the dashboard page.
/// </summary>
/// <param name="page">The page.</param>
/// <param name="loggedInUser">The logged in user.</param>
/// <param name="configurationManager">The configuration manager.</param>
/// <param name="appHost">The app host.</param>
/// <param name="logger">The logger.</param>
public static void OpenDashboardPage(string page, User loggedInUser, IServerConfigurationManager configurationManager, IServerApplicationHost appHost, ILogger logger)
public static void OpenDashboardPage(string page, IServerApplicationHost appHost, ILogger logger)
{
var url = "http://localhost:" + configurationManager.Configuration.HttpServerPortNumber + "/" +
var url = "http://localhost:" + appHost.HttpServerPort + "/" +
appHost.WebApplicationName + "/web/" + page;
OpenUrl(url, logger);
@@ -51,38 +45,31 @@ namespace MediaBrowser.ServerApplication.Native
/// <summary>
/// Opens the web client.
/// </summary>
/// <param name="userManager">The user manager.</param>
/// <param name="configurationManager">The configuration manager.</param>
/// <param name="appHost">The app host.</param>
/// <param name="logger">The logger.</param>
public static void OpenWebClient(IUserManager userManager, IServerConfigurationManager configurationManager, IServerApplicationHost appHost, ILogger logger)
public static void OpenWebClient(IServerApplicationHost appHost, ILogger logger)
{
var user = userManager.Users.FirstOrDefault(u => u.Configuration.IsAdministrator);
OpenDashboardPage("index.html", user, configurationManager, appHost, logger);
OpenDashboardPage("index.html", appHost, logger);
}
/// <summary>
/// Opens the dashboard.
/// </summary>
/// <param name="userManager">The user manager.</param>
/// <param name="configurationManager">The configuration manager.</param>
/// <param name="appHost">The app host.</param>
/// <param name="logger">The logger.</param>
public static void OpenDashboard(IUserManager userManager, IServerConfigurationManager configurationManager, IServerApplicationHost appHost, ILogger logger)
public static void OpenDashboard(IServerApplicationHost appHost, ILogger logger)
{
var user = userManager.Users.FirstOrDefault(u => u.Configuration.IsAdministrator);
OpenDashboardPage("dashboard.html", user, configurationManager, appHost, logger);
OpenDashboardPage("dashboard.html", appHost, logger);
}
/// <summary>
/// Opens the swagger.
/// </summary>
/// <param name="configurationManager">The configuration manager.</param>
/// <param name="appHost">The app host.</param>
/// <param name="logger">The logger.</param>
public static void OpenSwagger(IServerConfigurationManager configurationManager, IServerApplicationHost appHost, ILogger logger)
public static void OpenSwagger(IServerApplicationHost appHost, ILogger logger)
{
OpenUrl("http://localhost:" + configurationManager.Configuration.HttpServerPortNumber + "/" +
OpenUrl("http://localhost:" + appHost.HttpServerPort + "/" +
appHost.WebApplicationName + "/swagger-ui/index.html", logger);
}

8
MediaBrowser.ServerApplication/ServerNotifyIcon.cs
View File

@@ -107,7 +107,7 @@ namespace MediaBrowser.ServerApplication
cmdRestart,
toolStripSeparator1,
cmdApiDocs,
cmdLogWindow,
//cmdLogWindow,
cmdCommunity,
cmdExit});
contextMenuStrip1.Name = "contextMenuStrip1";
@@ -286,7 +286,7 @@ namespace MediaBrowser.ServerApplication
void cmdBrowse_Click(object sender, EventArgs e)
{
BrowserLauncher.OpenWebClient(_userManager, _configurationManager, _appHost, _logger);
BrowserLauncher.OpenWebClient(_appHost, _logger);
}
void cmdCommunity_Click(object sender, EventArgs e)
@@ -296,7 +296,7 @@ namespace MediaBrowser.ServerApplication
void cmdConfigure_Click(object sender, EventArgs e)
{
BrowserLauncher.OpenDashboard(_userManager, _configurationManager, _appHost, _logger);
BrowserLauncher.OpenDashboard(_appHost, _logger);
}
void cmdLogWindow_Click(object sender, EventArgs e)
@@ -323,7 +323,7 @@ namespace MediaBrowser.ServerApplication
void cmdSwagger_Click(object sender, EventArgs e)
{
BrowserLauncher.OpenSwagger(_configurationManager, _appHost, _logger);
BrowserLauncher.OpenSwagger(_appHost, _logger);
}
~ServerNotifyIcon()