php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6363, #8301, #8582, #9566: Fixed data methods and PJAX issues when used together

Browse Source
This commit is contained in:
derekisbusy
2015-10-18 19:38:42 -04:00
committed by Alexander Makarov
parent d5d40aa208
commit 17e2255472
3 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
framework/assets/yii.js
View File

@ -143,16 +143,51 @@ yii = (function ($) {
*
* @param $e the jQuery representation of the element
*/
handleAction: function ($e) {
handleAction: function ($e, event) {
var method = $e.data('method'),
$form = $e.closest('form'),
action = $e.attr('href'),
params = $e.data('params');
params = $e.data('params'),
pjax = $e.data('pjax'),
pjaxPushState = !!$e.data('pjax-push-state'),
pjaxReplaceState = !!$e.data('pjax-replace-state'),
pjaxTimeout = $e.data('pjax-timeout'),
pjaxScrollTo = $e.data('pjax-scrollto'),
pjaxContainer,
pjaxOptions = {};
if (pjax !== undefined && $.support.pjax) {
if ($e.data('pjax-container')) {
pjaxContainer = $e.data('pjax-container');
} else {
pjaxContainer = $e.closest('[data-pjax-container=""]');
}
// default to body if pjax container not found
if (!pjaxContainer.length) {
pjaxContainer = $('body');
}
pjaxOptions = {
container: pjaxContainer,
push: pjaxPushState,
replace: pjaxReplaceState,
scrollTo: pjaxScrollTo,
timeout: pjaxTimeout
}
}
if (method === undefined) {
if (action && action != '#') {
window.location = action;
if (pjax !== undefined && $.support.pjax) {
$.pjax.click(event, pjaxOptions);
} else {
window.location = action;
}
} else if ($e.is(':submit') && $form.length) {
if (pjax !== undefined && $.support.pjax) {
$form.on('submit',function(e){
$.pjax.submit(e, pjaxOptions);
})
}
$form.trigger('submit');
}
return;
@ -202,7 +237,11 @@ yii = (function ($) {
oldAction = $form.attr('action');
$form.attr('action', action);
}
if (pjax !== undefined && $.support.pjax) {
$form.on('submit',function(e){
$.pjax.submit(e, pjaxOptions);
})
}
$form.trigger('submit');
$.when($form.data('yiiSubmitFinalizePromise')).then(
function () {
@ -291,10 +330,10 @@ yii = (function ($) {
if (message !== undefined) {
pub.confirm(message, function () {
pub.handleAction($this);
pub.handleAction($this, event);
});
} else {
pub.handleAction($this);
pub.handleAction($this, event);
}
event.stopImmediatePropagation();
return false;