From 7ca1cd8795c465953ddb4560ce62fe6efba9f9d3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 2 Nov 2014 22:38:43 -0500 Subject: upgrade to jquery mobile 1.4.5 --- MediaBrowser.ServerApplication/ApplicationHost.cs | 2 +- .../EntryPoints/StartupWizard.cs | 16 +++--------- MediaBrowser.ServerApplication/MainStartup.cs | 2 +- .../Native/BrowserLauncher.cs | 29 ++++++---------------- MediaBrowser.ServerApplication/ServerNotifyIcon.cs | 8 +++--- 5 files changed, 17 insertions(+), 40 deletions(-) (limited to 'MediaBrowser.ServerApplication') diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 7eeb527ce6..ecba39dd6a 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -559,7 +559,7 @@ namespace MediaBrowser.ServerApplication var authContext = new AuthorizationContext(); RegisterSingleInstance(authContext); RegisterSingleInstance(new SessionContext(UserManager, authContext, SessionManager)); - RegisterSingleInstance(new AuthService(UserManager, SessionManager, authContext, ServerConfigurationManager)); + RegisterSingleInstance(new AuthService(UserManager, SessionManager, authContext, ServerConfigurationManager, ConnectManager)); RegisterSingleInstance(new SubtitleEncoder(LibraryManager, LogManager.GetLogger("SubtitleEncoder"), ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer)); diff --git a/MediaBrowser.ServerApplication/EntryPoints/StartupWizard.cs b/MediaBrowser.ServerApplication/EntryPoints/StartupWizard.cs index ea346e1bea..800eb9c11f 100644 --- a/MediaBrowser.ServerApplication/EntryPoints/StartupWizard.cs +++ b/MediaBrowser.ServerApplication/EntryPoints/StartupWizard.cs @@ -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 /// /// The _user manager /// - private readonly IUserManager _userManager; private readonly ILogger _logger; - private readonly IServerConfigurationManager _configurationManager; - /// /// Initializes a new instance of the class. /// /// The app host. - /// The user manager. - public StartupWizard(IServerApplicationHost appHost, IUserManager userManager, IServerConfigurationManager configurationManager, ILogger logger) + /// The logger. + public StartupWizard(IServerApplicationHost appHost, ILogger logger) { _appHost = appHost; _logger = logger; - _userManager = userManager; - _configurationManager = configurationManager; } /// @@ -54,9 +46,7 @@ namespace MediaBrowser.ServerApplication.EntryPoints /// 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); } /// diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index df6fd47465..c47dc2155c 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -300,7 +300,7 @@ namespace MediaBrowser.ServerApplication { if (e.Reason == SessionSwitchReason.SessionLogon) { - BrowserLauncher.OpenDashboard(_appHost.UserManager, _appHost.ServerConfigurationManager, _appHost, _logger); + BrowserLauncher.OpenDashboard(_appHost, _logger); } } diff --git a/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs b/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs index 3105928821..d4a85159d4 100644 --- a/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs +++ b/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs @@ -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. /// /// The page. - /// The logged in user. - /// The configuration manager. /// The app host. /// The logger. - 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 /// /// Opens the web client. /// - /// The user manager. - /// The configuration manager. /// The app host. /// The logger. - 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); } /// /// Opens the dashboard. /// - /// The user manager. - /// The configuration manager. /// The app host. /// The logger. - 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); } /// /// Opens the swagger. /// - /// The configuration manager. /// The app host. /// The logger. - 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); } diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs index e86327a0d9..585d6219a4 100644 --- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs +++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs @@ -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() -- cgit v1.2.3