Permalink
Browse files

BUGFIX: change namespace for the tree so all matchers are executed

Refer to similar commit on framework
(55cabd6fbfe5c2f90f0825ed2a51098dc9a2f5ac)
  • Loading branch information...
1 parent b75483e commit aaeebd6ea2a0c0034edb5b80e37b56e979781236 @mateusz mateusz committed May 18, 2012
Showing with 6 additions and 6 deletions.
  1. +5 −5 javascript/CMSMain.Tree.js
  2. +1 −1 javascript/ReportAdmin.Tree.js
View
@@ -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));
+}(jQuery));
@@ -2,7 +2,7 @@
* File: ReportAdmin.Tree.js
*/
(function($) {
- $.entwine('ss', function($){
+ $.entwine('ss.tree', function($){
/**
* Class: .cms-tree
*

0 comments on commit aaeebd6

Please sign in to comment.