Commit 80e9b800 by Carsten Brandt

replace pjax with external resouce via composer

We are now maintaining a fork of pjax: https://github.com/yiisoft/jquery-pjax
parent e51bf131
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
"lib-pcre": "*", "lib-pcre": "*",
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10", "yiisoft/jquery": "~2.0 | ~1.10",
"yiisoft/jquery-pjax": "*",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*" "cebe/markdown": "0.9.*"
}, },
......
Copyright (c) Chris Wanstrath
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Software), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
"lib-pcre": "*", "lib-pcre": "*",
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10", "yiisoft/jquery": "~2.0 | ~1.10",
"yiisoft/jquery-pjax": "*",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*" "cebe/markdown": "0.9.*"
}, },
......
...@@ -14,7 +14,7 @@ use yii\helpers\Json; ...@@ -14,7 +14,7 @@ use yii\helpers\Json;
use yii\web\Response; use yii\web\Response;
/** /**
* Pjax is a widget integrating the [pjax](https://github.com/defunkt/jquery-pjax) jQuery plugin. * Pjax is a widget integrating the [pjax](https://github.com/yiisoft/jquery-pjax) jQuery plugin.
* *
* Pjax only deals with the content enclosed between its [[begin()]] and [[end()]] calls, called the *body content* of the widget. * Pjax only deals with the content enclosed between its [[begin()]] and [[end()]] calls, called the *body content* of the widget.
* By default, any link click or form submission (for those forms with `data-pjax` attribute) within the body content * By default, any link click or form submission (for those forms with `data-pjax` attribute) within the body content
...@@ -27,7 +27,7 @@ use yii\web\Response; ...@@ -27,7 +27,7 @@ use yii\web\Response;
* *
* You may disable pjax for a specific link inside the container by adding `data-pjax="0"` attribute to this link. * 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, * The following example shows how to use Pjax with the [[\yii\grid\GridView]] widget so that the grid pagination,
* sorting and filtering can be done via pjax: * sorting and filtering can be done via pjax:
* *
* ```php * ```php
...@@ -80,7 +80,7 @@ class Pjax extends Widget ...@@ -80,7 +80,7 @@ class Pjax extends Widget
public $scrollTo = false; public $scrollTo = false;
/** /**
* @var array additional options to be passed to the pjax JS plugin. Please refer to * @var array additional options to be passed to the pjax JS plugin. Please refer to
* [pjax project page](https://github.com/defunkt/jquery-pjax) for available options. * [pjax project page](https://github.com/yiisoft/jquery-pjax) for available options.
*/ */
public $clientOptions; public $clientOptions;
......
...@@ -17,9 +17,9 @@ use yii\web\AssetBundle; ...@@ -17,9 +17,9 @@ use yii\web\AssetBundle;
*/ */
class PjaxAsset extends AssetBundle class PjaxAsset extends AssetBundle
{ {
public $sourcePath = '@yii/assets'; public $sourcePath = '@vendor/yiisoft/jquery-pjax';
public $js = [ public $js = [
'pjax/jquery.pjax.js', 'jquery.pjax.js',
]; ];
public $depends = [ public $depends = [
'yii\web\YiiAsset', 'yii\web\YiiAsset',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment