php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-21 09:01:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #5050.

Browse Source
This commit is contained in:
Qiang Xue
2014-09-16 14:15:32 -04:00
parent 583c660c80
commit 8d082c11a1
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
framework/assets/yii.js
View File

@@ -118,18 +118,23 @@ yii = (function ($) {
* For other elements, either the containing form action or the current page URL will be used * For other elements, either the containing form action or the current page URL will be used
* as the form action URL. * as the form action URL.
* *
* If the `data-method` attribute is not defined, nothing will be done. * If the `data-method` attribute is not defined, the `href` attribute (if any) of the element
* will be assigned to `window.location`.
* *
* @param $e the jQuery representation of the element * @param $e the jQuery representation of the element
*/ */
handleAction: function ($e) { handleAction: function ($e) {
var method = $e.data('method'); var method = $e.data('method'),
$form = $e.closest('form'),
action = $e.attr('href');
if (method === undefined) { if (method === undefined) {
if (action && action != '#') {
window.location = action;
}
return; return;
} }
var $form = $e.closest('form');
var action = $e.attr('href');
var newForm = !$form.length || action && action != '#'; var newForm = !$form.length || action && action != '#';
if (newForm) { if (newForm) {
if (!action || !action.match(/(^\/|:\/\/)/)) { if (!action || !action.match(/(^\/|:\/\/)/)) {
@@ -227,12 +232,14 @@ yii = (function ($) {
function initDataMethods() { function initDataMethods() {
var handler = function (event) { var handler = function (event) {
var $this = $(this); var $this = $(this),
// data-confirm requires data-method method = $this.data('method'),
if ($this.data('method') === undefined) { message = $this.data('confirm');
if (method === undefined && message === undefined) {
return true; return true;
} }
var message = $this.data('confirm');
if (message !== undefined) { if (message !== undefined) {
pub.confirm(message, function () { pub.confirm(message, function () {
pub.handleAction($this); pub.handleAction($this);