From b057b6d68ac8179d1f237bf45eb6fe96be4c32e1 Mon Sep 17 00:00:00 2001 From: "Matt@MBP13-PC" Date: Thu, 16 Aug 2012 10:03:37 -0100 Subject: [PATCH] Implemented media sorting --- .../FolderBrowser/Js/folderbrowser.js | 21 +++++++++++++++++-- .../WebServices/FolderBrowserService.cs | 9 -------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js index cdad318d0f..968532019c 100644 --- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js +++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js @@ -117,7 +117,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); }); self._viewModel.filtered = ko.computed(function () { - return self._viewModel.items(); + //return self._viewModel.items(); return ko.utils.arrayFilter(this.items(), function (item) { return item.Name().toLowerCase().indexOf(self._viewModel.filterTerm()) > -1 || item.Tags().toLowerCase().indexOf(self._viewModel.filterTerm()) > -1; @@ -138,6 +138,14 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); return ids; }, self._viewModel); + self._viewModel.itemIds = ko.computed(function () { + var ids = []; + ko.utils.arrayForEach(this.items(), function (item) { + ids.push(item.Id()); + }); + return ids; + }, self._viewModel); + self._viewModel.filterTerm.subscribe(function (newValue) { self._getChildNodes(); }); @@ -346,7 +354,16 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); } else { - //TODO: Update on server + $.post(self._opts.umbracoPath + "/webservices/nodeSorter.asmx/UpdateSortOrder", { + ParentId : self._parentId, + SortOrder: self._viewModel.itemIds().join(","), + app: "media" + }, function (data, textStatus) { + if(textStatus == "error") { + alert("Oops. Could not update sort order"); + self._getChildNodes(); + } + }, "json"); } } }); diff --git a/src/Umbraco.Web/WebServices/FolderBrowserService.cs b/src/Umbraco.Web/WebServices/FolderBrowserService.cs index db5333d4a7..4bf2ca5fc4 100644 --- a/src/Umbraco.Web/WebServices/FolderBrowserService.cs +++ b/src/Umbraco.Web/WebServices/FolderBrowserService.cs @@ -85,14 +85,5 @@ namespace Umbraco.Web.WebServices success = true }); } - - [RestExtensionMethod(returnXml = false)] - public static string UpdateSortOrder(int parentId, IDictionary map) - { - return new JavaScriptSerializer().Serialize(new - { - success = true - }); - } } }