php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-20 10:27:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source
This commit is contained in:
Qiang Xue
2013-08-17 07:04:01 -04:00
parent 208a274364 0679d8ca74
commit ff7187e5d8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/guide/view.md
View File

@ -207,12 +207,12 @@ page. We're using third argument so one of the views could override it.
### Registering scripts
With View object you can register scripts. There are two dedicated methods for it: `registerScript` for inline scripts
With View object you can register scripts. There are two dedicated methods for it: `registerJs` for inline scripts
and `registerJsFile` for external scripts. Inline scripts are useful for configuration and dynamically generated code.
The method for adding these can be used as follows:
```php
$this->registerScript("var options = ".json_encode($options).";", View::POS_END, 'my-options');
$this->registerJs("var options = ".json_encode($options).";", View::POS_END, 'my-options');
```
First argument is the actual code where we're converting a PHP array of options to JavaScript one. Second argument

2
framework/yii/gii/Generator.php
View File

@ -262,6 +262,7 @@ abstract class Generator extends Model
'break',
'case',
'catch',
'callable',
'cfunction',
'class',
'clone',
@ -297,6 +298,7 @@ abstract class Generator extends Model
'include',
'include_once',
'instanceof',
'insteadof',
'interface',
'isset',
'list',