tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Merge errors

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-28 16:56:21 +01:00
parent 80fe9c8864
commit a317b66a8a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
javascript/AssetAdmin.js
View File

@ -31,7 +31,10 @@
$('#Form_EditForm_File .ss-gridfield-item').entwine({
onclick: function(e) {
// Let actions do their own thing
if($(e.target).is('.action')) return;
if($(e.target).is('.action')) {
this._super();
return;
}
var grid = this.closest('.ss-gridfield');
if(this.data('class') == 'Folder') {

2
javascript/CMSMain.GridField.js
View File

@ -1,5 +1,5 @@
jQuery(function($){
$('fieldset.ss-gridfield').entwine({
$('.ss-gridfield').entwine({
onopennewview: function(e, url) {
$('.cms-container').entwine('ss').loadPanel(url);
return false;