From aaeebd6ea2a0c0034edb5b80e37b56e979781236 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Fri, 18 May 2012 12:09:47 +1200
Subject: [PATCH] BUGFIX: change namespace for the tree so all matchers are
 executed

Refer to similar commit on framework
(55cabd6fbfe5c2f90f0825ed2a51098dc9a2f5ac)
---
 javascript/CMSMain.Tree.js     | 10 +++++-----
 javascript/ReportAdmin.Tree.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/javascript/CMSMain.Tree.js b/javascript/CMSMain.Tree.js
index 7fd46304..0ba83ffe 100644
--- a/javascript/CMSMain.Tree.js
+++ b/javascript/CMSMain.Tree.js
@@ -1,6 +1,6 @@
 (function($) {
 
-	$.entwine('ss', function($){
+	$.entwine('ss.tree', function($){
 		$('.cms-tree').entwine({
 			getTreeConfig: function() {
 				var self = this, config = this._super(), hints = this.getHints();
@@ -18,7 +18,7 @@
 									'label': '<span class="jstree-pageicon"></span>' + val.ssname,
 									'_class': 'class-' + val.pagetype,
 									'action': function(obj) {
-										$('.cms-container').loadPanel(ss.i18n.sprintf(
+										$('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
 											self.data('urlAddpage'), id, val.pagetype
 										));
 									}
@@ -30,7 +30,7 @@
 								'edit': {
 									'label': ss.i18n._t('Tree.EditPage'),
 									'action': function(obj) {
-										$('.cms-container').loadPanel(ss.i18n.sprintf(
+										$('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
 											self.data('urlEditpage'), obj.data('id')
 										));
 									}
@@ -41,7 +41,7 @@
 							menuitems['addsubpage'] = {
 									'label': ss.i18n._t('Tree.AddSubPage'),
 									'action': function(obj) {
-										$('.cms-container').loadPanel(ss.i18n.sprintf(
+										$('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
 											self.data('urlAddpage'), id, 'Page'
 										));
 									},
@@ -56,4 +56,4 @@
 		});
 	});
 
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/javascript/ReportAdmin.Tree.js b/javascript/ReportAdmin.Tree.js
index 53b5aec2..a7a93aef 100644
--- a/javascript/ReportAdmin.Tree.js
+++ b/javascript/ReportAdmin.Tree.js
@@ -2,7 +2,7 @@
  * File: ReportAdmin.Tree.js
  */
 (function($) {
-	$.entwine('ss', function($){
+	$.entwine('ss.tree', function($){
 		/**
 		 * Class: .cms-tree
 		 *