From 6a7e346bf2a7320490e2960b402b41ff5ac14c38 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Fri, 15 Feb 2013 15:38:53 -0800 Subject: [PATCH] moved to tablesorter. --- NzbDrone.Api/Directories/DirectoryModule.cs | 6 +- NzbDrone.Api/Properties/AssemblyInfo.cs | 2 + NzbDrone.Web/NzbDrone.Web.csproj | 8 +- NzbDrone.Web/Views/V2/Index.cshtml | 13 +- .../_backboneApp/.idea/jsLibraryMappings.xml | 2 +- .../.idea/libraries/backbone_marionette.xml | 15 + NzbDrone.Web/_backboneApp/.idea/vcs.xml | 2 +- .../AddSeries/RootFolders/RootFolderView.js | 2 +- .../_backboneApp/CassetteConfiguration.cs | 3 +- .../Content/jquery.dataTables.bootstrap.css | 111 +- .../Content/tablesorter.bootstrap.css | 128 + NzbDrone.Web/_backboneApp/Controller.js | 38 + .../JsLibraries/jquery-1.8.2.intellisense.js | 2494 ----------------- .../jquery.tablesorter.bootstrap.js | 981 +++++++ .../JsLibraries/jquery.tablesorter.js | 1031 +++++++ .../_backboneApp/Mixins/backbone.ajax.js | 50 + .../_backboneApp/Mixins/backbone.xhr.js | 0 NzbDrone.Web/_backboneApp/Routing.js | 19 +- .../Series/SeriesCollectionTemplate.html | 8 +- .../Series/SeriesCollectionView.js | 80 +- .../_backboneApp/Shared/AutoComplete.js | 14 +- NzbDrone.Web/_backboneApp/app.js | 1 + 22 files changed, 2321 insertions(+), 2687 deletions(-) create mode 100644 NzbDrone.Web/_backboneApp/.idea/libraries/backbone_marionette.xml create mode 100644 NzbDrone.Web/_backboneApp/Content/tablesorter.bootstrap.css create mode 100644 NzbDrone.Web/_backboneApp/Controller.js delete mode 100644 NzbDrone.Web/_backboneApp/JsLibraries/jquery-1.8.2.intellisense.js create mode 100644 NzbDrone.Web/_backboneApp/JsLibraries/jquery.tablesorter.bootstrap.js create mode 100644 NzbDrone.Web/_backboneApp/JsLibraries/jquery.tablesorter.js create mode 100644 NzbDrone.Web/_backboneApp/Mixins/backbone.ajax.js delete mode 100644 NzbDrone.Web/_backboneApp/Mixins/backbone.xhr.js diff --git a/NzbDrone.Api/Directories/DirectoryModule.cs b/NzbDrone.Api/Directories/DirectoryModule.cs index 674171e8e..560364732 100644 --- a/NzbDrone.Api/Directories/DirectoryModule.cs +++ b/NzbDrone.Api/Directories/DirectoryModule.cs @@ -16,15 +16,15 @@ namespace NzbDrone.Api.Directories : base("/directories") { _diskProvider = diskProvider; - Post["/"] = x => GetDirectories(); + Get["/"] = x => GetDirectories(); } private Response GetDirectories() { - if (!Request.Form.query.HasValue) + if (!Request.Query.query.HasValue) return new List().AsResponse(); - string query = Request.Form.query.Value; + string query = Request.Query.query.Value; IEnumerable dirs = null; try diff --git a/NzbDrone.Api/Properties/AssemblyInfo.cs b/NzbDrone.Api/Properties/AssemblyInfo.cs index 5d17bb7bf..812afcebc 100644 --- a/NzbDrone.Api/Properties/AssemblyInfo.cs +++ b/NzbDrone.Api/Properties/AssemblyInfo.cs @@ -34,3 +34,5 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] + +[assembly: InternalsVisibleTo("NzbDrone.Core")] diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index b96f11898..723b697a4 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -210,10 +210,13 @@ + + + + - @@ -424,8 +427,6 @@ - - @@ -439,7 +440,6 @@ - diff --git a/NzbDrone.Web/Views/V2/Index.cshtml b/NzbDrone.Web/Views/V2/Index.cshtml index 9ecb12368..e37caf806 100644 --- a/NzbDrone.Web/Views/V2/Index.cshtml +++ b/NzbDrone.Web/Views/V2/Index.cshtml @@ -13,7 +13,7 @@ - @ViewBag.Title - NzbDrone + NzbDrone @@ -42,8 +42,8 @@