From fec71a06ebcf0a4a6dd17d597a30c99ccbe775b8 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 03:15:47 +0000 Subject: [PATCH] ENHANCEMENT Moved sitetree filter functionality back into CMSMain->SearchForm() to simplify both serverside and clientside processing, and save precious UI real estate above the tree panel git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92725 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/CMSMain_left.js | 36 ------------------------- templates/Includes/CMSMain_TreeTools.ss | 8 ------ 2 files changed, 44 deletions(-) diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js index 77be9e4b..824b7cb6 100755 --- a/javascript/CMSMain_left.js +++ b/javascript/CMSMain_left.js @@ -4,42 +4,6 @@ SiteTreeHandlers.orderChanged_url = 'admin/ajaxupdatesort'; SiteTreeHandlers.loadPage_url = 'admin/getitem'; SiteTreeHandlers.loadTree_url = 'admin/getsubtree'; -SiteTreeFilter = Class.create(); -SiteTreeFilter.applyTo('#siteTreeFilterList'); -SiteTreeFilter.prototype = { - initialize: function () { - }, - onchange : function() { - var value = this.options[this.selectedIndex].value; - - if(value != 'all') { - $('sitetree').setCustomURL(SiteTreeHandlers.controller_url+'/getfilteredsubtree?filter='+escape(value)); - } else { - $('sitetree').clearCustomURL(); - } - - // We can't update the tree while it's draggable; it gets b0rked. - var __makeDraggableAfterUpdate = false; - if($('sitetree').isDraggable) { - $('sitetree').stopBeingDraggable(); - __makeDraggableAfterUpdate = true; - } - - var indicator = $('siteTreeFilterActionIndicator'); - indicator.style.display = 'inline'; - - $('sitetree').reload({ - onSuccess: function() { - indicator.style.display = 'none'; - if(__makeDraggableAfterUpdate) $('sitetree').makeDraggable(); - }, - onFailure: function(response) { - errorMessage('Could not update tree', response); - } - }); - } -} - /** * Tree context menu */ diff --git a/templates/Includes/CMSMain_TreeTools.ss b/templates/Includes/CMSMain_TreeTools.ss index 84c4a0e6..cdb6bc08 100644 --- a/templates/Includes/CMSMain_TreeTools.ss +++ b/templates/Includes/CMSMain_TreeTools.ss @@ -31,14 +31,6 @@ - -
- Show: -