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

Merge in changes from 3.0.1-rc2

Browse Source
This commit is contained in:
Hamish Friedlander 2012-07-27 11:14:32 +12:00
commit a9bedccd1f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/javascript/LeftAndMain.js
View File

@ -344,7 +344,12 @@ jQuery.noConflict();
} else { } else {
// Fall back to replacing the content fragment if HTML is returned // Fall back to replacing the content fragment if HTML is returned
$data = $(data); $data = $(data);
guessFragment = $data.is('form') ? 'CurrentForm' : 'Content';
// Try and guess the fragment if none is provided
// TODO: data-pjax-fragment might actually give us the fragment. For now we just check most common case
guessFragment = 'Content';
if ($data.is('form') && !$data.is('[data-pjax-fragment~=Content]')) guessFragment = 'CurrentForm';
newFragments[guessFragment] = $data; newFragments[guessFragment] = $data;
} }