tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Don't trigger on click on construction of view-model toggles, as it bubbles up to the panel, where it causes a toggle action which overrides any previous user choices stored in cookies (fixes #7210)

Browse Source
This commit is contained in:
Ingo Schommer 2012-05-01 14:10:09 +02:00
parent feab46e075
commit 4c2352f908
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/javascript/LeftAndMain.Panel.js
View File

@ -63,14 +63,6 @@
this._super();
},
onclick: function(e) {
// By default, the whole collapsed area serves as a trigger
if(this.data('expandOnClick') && jQuery(this).hasClass('collapsed')) {
e.preventDefault();
this.expandPanel();
}
},
/**
* @param {Boolean} TRUE to expand, FALSE to collapse.
* @param {Boolean} TRUE means that events won't be fired, which is useful for the component initialization phase.

9
admin/javascript/LeftAndMain.Tree.js
View File

@ -328,13 +328,16 @@
$('.cms-tree-view-modes input.view-mode').entwine({
onmatch: function() {
// set active by default
this.trigger('click');
this.redraw();
this._super();
},
onclick: function(e) {
this.redraw();
},
redraw: function(type) {
$('.cms-tree')
.toggleClass('draggable', $(e.target).val() == 'draggable')
.toggleClass('multiple', $(e.target).val() == 'multiselect');
.toggleClass('draggable', this.val() == 'draggable')
.toggleClass('multiple', this.val() == 'multiselect');
}
});
});