Merge pull request #2612 from tof06/master

framework/assets/pjax/jquery.pjax.js

@@ -44,6 +44,8 @@
 // event   - "click" jQuery.Event
 // options - pjax options
 //
+// If the click event target has 'data-pjax="0"' attribute, the event is ignored, and no pjax call is made.
+//
 // Examples
 //
 //   $(document).on('click', 'a', $.pjax.click)
@@ -61,6 +63,10 @@
 
 		var link = event.currentTarget
 
+		// Ignore links with data-pjax="0"
+		if ($(link).data('pjax')==0)
+			return
+
 		if (link.tagName.toUpperCase() !== 'A')
 			throw "$.fn.pjax or $.pjax.click requires an anchor element"
 

framework/grid/ActionColumn.php

@@ -88,6 +88,7 @@ class ActionColumn extends Column
 			$this->buttons['view'] = function ($url, $model) {
 				return Html::a('<span class="glyphicon glyphicon-eye-open"></span>', $url, [
 					'title' => Yii::t('yii', 'View'),
+					'data-pjax' => '0',
 				]);
 			};
 		}
@@ -95,6 +96,7 @@ class ActionColumn extends Column
 			$this->buttons['update'] = function ($url, $model) {
 				return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
 					'title' => Yii::t('yii', 'Update'),
+					'data-pjax' => '0',
 				]);
 			};
 		}
@@ -104,6 +106,7 @@ class ActionColumn extends Column
 					'title' => Yii::t('yii', 'Delete'),
 					'data-confirm' => Yii::t('yii', 'Are you sure to delete this item?'),
 					'data-method' => 'post',
+					'data-pjax' => '0',
 				]);
 			};
 		}

framework/widgets/Pjax.php

@@ -25,6 +25,8 @@ use yii\web\Response;
  * You may configure [[linkSelector]] to specify which links should trigger pjax, and configure [[formSelector]]
  * to specify which form submission may trigger pjax.
  *
+ * You may disable pjax for a specific link inside the container by adding `data-pjax="0"` attribute to this link.
+ *
  * The following example shows how to use Pjax with the [[\yii\gridview\GridView]] widget so that the grid pagination,
  * sorting and filtering can be done via pjax:
  *