Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-22 15:07:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

20160611

Browse Source
This commit is contained in:
cuiliang
2016-06-11 19:49:57 +08:00
parent 13e014b7d9 89ad1f534a
commit cd9caf65d2
2065 changed files with 88639 additions and 74804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/web/JsExpression.php
View File

@@ -12,11 +12,15 @@ use yii\base\Object;
/**
* JsExpression marks a string as a JavaScript expression.
*
<<<<<<< HEAD
<<<<<<< HEAD
* When using [[\yii\helpers\Json::encode()]] to encode a value, JsonExpression objects
=======
* When using [[\yii\helpers\Json::encode()]] or [[\yii\helpers\Json::htmlEncode()]] to encode a value, JsonExpression objects
>>>>>>> yiichina/master
=======
* When using [[\yii\helpers\Json::encode()]] or [[\yii\helpers\Json::htmlEncode()]] to encode a value, JsonExpression objects
>>>>>>> master
* will be specially handled and encoded as a JavaScript expression instead of a string.
*
* @author Qiang Xue <qiang.xue@gmail.com>