Browse Source

move JsExpression to web.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
dd5969147d
  1. 2
      framework/helpers/base/Json.php
  2. 2
      framework/validators/EmailValidator.php
  3. 2
      framework/validators/NumberValidator.php
  4. 2
      framework/validators/RegularExpressionValidator.php
  5. 2
      framework/validators/UrlValidator.php
  6. 2
      framework/web/JsExpression.php
  7. 2
      framework/widgets/ActiveField.php
  8. 2
      tests/unit/framework/helpers/JsonTest.php

2
framework/helpers/base/Json.php

@ -8,7 +8,7 @@
namespace yii\helpers\base;
use yii\base\InvalidParamException;
use yii\helpers\JsExpression;
use yii\web\JsExpression;
/**
* Json is a helper class providing JSON data encoding and decoding.

2
framework/validators/EmailValidator.php

@ -9,7 +9,7 @@ namespace yii\validators;
use Yii;
use yii\helpers\Html;
use yii\helpers\JsExpression;
use yii\web\JsExpression;
use yii\helpers\Json;
/**

2
framework/validators/NumberValidator.php

@ -9,7 +9,7 @@ namespace yii\validators;
use Yii;
use yii\helpers\Html;
use yii\helpers\JsExpression;
use yii\web\JsExpression;
use yii\helpers\Json;
/**

2
framework/validators/RegularExpressionValidator.php

@ -10,7 +10,7 @@ namespace yii\validators;
use Yii;
use yii\base\InvalidConfigException;
use yii\helpers\Html;
use yii\helpers\JsExpression;
use yii\web\JsExpression;
use yii\helpers\Json;
/**

2
framework/validators/UrlValidator.php

@ -9,7 +9,7 @@ namespace yii\validators;
use Yii;
use yii\helpers\Html;
use yii\helpers\JsExpression;
use yii\web\JsExpression;
use yii\helpers\Json;
/**

2
framework/helpers/JsExpression.php → framework/web/JsExpression.php

@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/
namespace yii\helpers;
namespace yii\web;
use yii\base\Object;

2
framework/widgets/ActiveField.php

@ -10,7 +10,7 @@ use yii\base\Component;
use yii\db\ActiveRecord;
use yii\helpers\Html;
use yii\base\Model;
use yii\helpers\JsExpression;
use yii\web\JsExpression;
/**
* @author Qiang Xue <qiang.xue@gmail.com>

2
tests/unit/framework/helpers/JsonTest.php

@ -4,7 +4,7 @@
namespace yiiunit\framework\helpers;
use yii\helpers\Json;
use yii\helpers\JsExpression;
use yii\web\JsExpression;
class JsonTest extends \yii\test\TestCase
{

Loading…
Cancel
Save