update to jquery mobile 1.4.3

5 files changed, 2 insertions, 216 deletions

diff --git a/MediaBrowser.Model/Configuration/NotificationOption.cs b/MediaBrowser.Model/Configuration/NotificationOption.cs
deleted file mode 100644
index 5fcf3550c..000000000
--- a/MediaBrowser.Model/Configuration/NotificationOption.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public class NotificationOption
-    {
-        public string Type { get; set; }
-
-        /// <summary>
-        /// User Ids to not monitor (it's opt out)
-        /// </summary>
-        public string[] DisabledMonitorUsers { get; set; }
-
-        /// <summary>
-        /// User Ids to send to (if SendToUserMode == Custom)
-        /// </summary>
-        public string[] SendToUsers { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="NotificationOption"/> is enabled.
-        /// </summary>
-        /// <value><c>true</c> if enabled; otherwise, <c>false</c>.</value>
-        public bool Enabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title format string.
-        /// </summary>
-        /// <value>The title format string.</value>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description { get; set; }
-        
-        /// <summary>
-        /// Gets or sets the disabled services.
-        /// </summary>
-        /// <value>The disabled services.</value>
-        public string[] DisabledServices { get; set; }
-
-        /// <summary>
-        /// Gets or sets the send to user mode.
-        /// </summary>
-        /// <value>The send to user mode.</value>
-        public SendToUserType SendToUserMode { get; set; }
-
-        public NotificationOption()
-        {
-            DisabledServices = new string[] { };
-            DisabledMonitorUsers = new string[] { };
-            SendToUsers = new string[] { };
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/NotificationOptions.cs b/MediaBrowser.Model/Configuration/NotificationOptions.cs
deleted file mode 100644
index dd523d947..000000000
--- a/MediaBrowser.Model/Configuration/NotificationOptions.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using MediaBrowser.Model.Extensions;
-
-namespace MediaBrowser.Model.Configuration
-{
-    public class NotificationOptions
-    {
-        public NotificationOption[] Options { get; set; }
-
-        public NotificationOptions()
-        {
-            Options = new[]
-            {
-                new NotificationOption
-                {
-                    Type = NotificationType.TaskFailed.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.ServerRestartRequired.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.ApplicationUpdateAvailable.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.ApplicationUpdateInstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginUpdateInstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginUninstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.InstallationFailed.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginInstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginError.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                }
-            };
-        }
-
-        public NotificationOption GetOptions(string type)
-        {
-            foreach (NotificationOption i in Options)
-            {
-                if (StringHelper.EqualsIgnoreCase(type, i.Type)) return i;
-            }
-            return null;
-        }
-
-        public bool IsEnabled(string type)
-        {
-            NotificationOption opt = GetOptions(type);
-
-            return opt != null && opt.Enabled;
-        }
-
-        public bool IsServiceEnabled(string service, string notificationType)
-        {
-            NotificationOption opt = GetOptions(notificationType);
-
-            return opt == null ||
-                   !ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
-        }
-
-        public bool IsEnabledToMonitorUser(string type, string userId)
-        {
-            NotificationOption opt = GetOptions(type);
-
-            return opt != null && opt.Enabled &&
-                   !ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId);
-        }
-
-        public bool IsEnabledToSendToUser(string type, string userId, UserConfiguration userConfig)
-        {
-            NotificationOption opt = GetOptions(type);
-
-            if (opt != null && opt.Enabled)
-            {
-                if (opt.SendToUserMode == SendToUserType.All)
-                {
-                    return true;
-                }
-
-                if (opt.SendToUserMode == SendToUserType.Admins && userConfig.IsAdministrator)
-                {
-                    return true;
-                }
-
-                return ListHelper.ContainsIgnoreCase(opt.SendToUsers, userId);
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Configuration/NotificationType.cs b/MediaBrowser.Model/Configuration/NotificationType.cs
deleted file mode 100644
index d8043b0e1..000000000
--- a/MediaBrowser.Model/Configuration/NotificationType.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public enum NotificationType
-    {
-        ApplicationUpdateAvailable,
-        ApplicationUpdateInstalled,
-        AudioPlayback,
-        GamePlayback,
-        VideoPlayback,
-        AudioPlaybackStopped,
-        GamePlaybackStopped,
-        VideoPlaybackStopped,
-        InstallationFailed,
-        PluginError,
-        PluginInstalled,
-        PluginUpdateInstalled,
-        PluginUninstalled,
-        NewLibraryContent,
-        NewLibraryContentMultiple,
-        ServerRestartRequired,
-        TaskFailed
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/SendToUserType.cs b/MediaBrowser.Model/Configuration/SendToUserType.cs
deleted file mode 100644
index a2eac4c2d..000000000
--- a/MediaBrowser.Model/Configuration/SendToUserType.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public enum SendToUserType
-    {
-        All = 0,
-        Admins = 1,
-        Custom = 2
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index f7b888f82..36c353479 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Weather;
+using MediaBrowser.Model.Notifications;
+using MediaBrowser.Model.Weather;
 using System;
 
 namespace MediaBrowser.Model.Configuration
@@ -178,8 +179,6 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The encoding quality.</value>
         public EncodingQuality MediaEncodingQuality { get; set; }
 
-        public bool AllowVideoUpscaling { get; set; }
-
         public MetadataOptions[] MetadataOptions { get; set; }
 
         public bool EnableDebugEncodingLogging { get; set; }
@@ -268,10 +267,7 @@ namespace MediaBrowser.Model.Configuration
                 new MetadataOptions(0, 1280) {ItemType = "Season"}
             };
 
-            NotificationOptions = new NotificationOptions();
-
             SubtitleOptions = new SubtitleOptions();
-
             LiveTvOptions = new LiveTvOptions();
             TvFileOrganizationOptions = new TvFileOrganizationOptions();
         }