Skip to content

Commit 6618ce3

Browse files
committed
change local variable
1 parent d764136 commit 6618ce3

File tree

4 files changed

+110
-13
lines changed

4 files changed

+110
-13
lines changed

AngularAnimateAsset.php

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
namespace dee\angular;
4+
5+
/**
6+
* AngularAnimateAsset
7+
*
8+
* @author Misbahul D Munir <misbahuldmunir@gmail.com>
9+
* @since 1.1
10+
*/
11+
class AngularAnimateAsset extends \yii\web\AssetBundle
12+
{
13+
/**
14+
* @inheritdoc
15+
*/
16+
public $sourcePath = '@bower/angular-animate';
17+
18+
/**
19+
* @inheritdoc
20+
*/
21+
public $js = [
22+
'angular-animate.js',
23+
];
24+
25+
/**
26+
* @inheritdoc
27+
*/
28+
public $depends = [
29+
'dee\angular\AngularAsset'
30+
];
31+
}

AngularAriaAsset.php

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
namespace dee\angular;
4+
5+
/**
6+
* AngularAnimateAsset
7+
*
8+
* @author Misbahul D Munir <misbahuldmunir@gmail.com>
9+
* @since 1.1
10+
*/
11+
class AngularAriaAsset extends \yii\web\AssetBundle
12+
{
13+
/**
14+
* @inheritdoc
15+
*/
16+
public $sourcePath = '@bower/angular-aria';
17+
18+
/**
19+
* @inheritdoc
20+
*/
21+
public $js = [
22+
'angular-aria.js',
23+
];
24+
25+
/**
26+
* @inheritdoc
27+
*/
28+
public $depends = [
29+
'dee\angular\AngularAsset'
30+
];
31+
}

AngularTouchAsset.php

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
namespace dee\angular;
4+
5+
/**
6+
* AngularTouchAsset
7+
*
8+
* @author Misbahul D Munir <misbahuldmunir@gmail.com>
9+
* @since 1.1
10+
*/
11+
class AngularTouchAsset extends \yii\web\AssetBundle
12+
{
13+
/**
14+
* @inheritdoc
15+
*/
16+
public $sourcePath = '@bower/angular-touch';
17+
18+
/**
19+
* @inheritdoc
20+
*/
21+
public $js = [
22+
'angular-touch.js',
23+
];
24+
25+
/**
26+
* @inheritdoc
27+
*/
28+
public $depends = [
29+
'dee\angular\AngularAsset'
30+
];
31+
}

NgView.php

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
use Yii;
66
use yii\helpers\Html;
77
use yii\helpers\ArrayHelper;
8-
use yii\base\InvalidConfigException;
98
use yii\helpers\Json;
109
use yii\helpers\Inflector;
1110
use yii\web\View as WebView;
11+
use yii\base\Widget;
1212

1313
/**
1414
* Description of NgView
@@ -17,7 +17,7 @@
1717
* @author Misbahul D Munir <misbahuldmunir@gmail.com>
1818
* @since 1.0
1919
*/
20-
class NgView extends \yii\base\Widget
20+
class NgView extends Widget
2121
{
2222
/**
2323
*
@@ -77,6 +77,9 @@ class NgView extends \yii\base\Widget
7777
'dee.angular' => 'dee\angular\DeeAngularAsset',
7878
'ngRoute' => 'dee\angular\AngularRouteAsset',
7979
'ngResource' => 'dee\angular\AngularResourceAsset',
80+
'ngAnimate' => 'dee\angular\AngularAnimateAsset',
81+
'ngAria' => 'dee\angular\AngularAnimateAsset',
82+
'ngTouch' => 'dee\angular\AngularAnimateAsset',
8083
];
8184
private $_varName;
8285

@@ -131,7 +134,7 @@ public function run()
131134
$js[] = $this->renderResources();
132135

133136
$options = empty($this->clientOptions)?'{}': Json::htmlEncode($this->clientOptions);
134-
$js[] = "\nreturn {$this->_varName};\n})({$options});";
137+
$js[] = "\nreturn module;\n})({$options});";
135138

136139
$view->registerJs(implode("\n", $js), WebView::POS_END);
137140

@@ -150,7 +153,7 @@ protected function applyRoute($route, $path)
150153
$link = Json::htmlEncode($route['link']);
151154
unset($route['link'], $route['view'], $route['controller'], $route['visible']);
152155
$route = Json::htmlEncode($route);
153-
$routeProvider = "angular.extend({},{$this->_varName}.templates[{$link}],{$route})";
156+
$routeProvider = "angular.extend({},module.templates[{$link}],{$route})";
154157
} else {
155158
$injection = ArrayHelper::remove($route, 'injection', []);
156159

@@ -171,7 +174,7 @@ protected function applyRoute($route, $path)
171174
$template = $route;
172175

173176
$path = Json::htmlEncode($path);
174-
$routeProvider = "{$this->_varName}.templates[{$path}]";
177+
$routeProvider = "module.templates[{$path}]";
175178
}
176179
$this->controller = null;
177180
return [$routeProvider, $controller, $template];
@@ -190,7 +193,7 @@ public function requires($requires)
190193
/**
191194
* Render script create module. The result are
192195
* ```javascript
193-
* appName = angular.module('appName',[requires,...]);
196+
* module = angular.module('appName',[requires,...]);
194197
* ```
195198
*/
196199
protected function renderModule()
@@ -207,7 +210,8 @@ protected function renderModule()
207210
$class::register($view);
208211
}
209212
}
210-
$js = "{$this->_varName} = angular.module('{$this->name}'," . Json::htmlEncode($requires) . ");";
213+
$js = "var module = angular.module('{$this->name}'," . Json::htmlEncode($requires) . ");\n"
214+
. "var {$this->_varName} = module;";
211215

212216
if ($this->js !== null) {
213217
$js .= "\n" . static::parseBlockJs($view->render($this->js));
@@ -217,7 +221,7 @@ protected function renderModule()
217221

218222
protected function renderTemplates($templates)
219223
{
220-
return "{$this->_varName}.templates = " . Json::htmlEncode($templates) . ';';
224+
return "module.templates = " . Json::htmlEncode($templates) . ';';
221225
}
222226

223227
/**
@@ -227,13 +231,13 @@ protected function renderTemplates($templates)
227231
protected function renderRouteProviders($routeProviders)
228232
{
229233
$routeProviders = implode("\n", $routeProviders);
230-
return "{$this->_varName}.config(['\$routeProvider',function(\$routeProvider){\n{$routeProviders}\n}]);";
234+
return "module.config(['\$routeProvider',function(\$routeProvider){\n{$routeProviders}\n}]);";
231235
}
232236

233237
/**
234238
* Render script create controllers
235239
* ```javascript
236-
* appName.controller('CtrlName',['$scope',...,
240+
* module.controller('CtrlName',['$scope',...,
237241
* function($scope,...){
238242
* ...
239243
* }]);
@@ -249,15 +253,15 @@ protected function renderControllers($controllers)
249253
$injectionStr = rtrim(Json::htmlEncode($injection),']');
250254
$injectionVar = implode(", ", $injection);
251255
$function = implode("\n", ArrayHelper::getValue($view->js, $name, []));
252-
$js[] = "{$this->_varName}.controller('$name',{$injectionStr},\nfunction($injectionVar){\n{$function}\n}]);";
256+
$js[] = "module.controller('$name',{$injectionStr},\nfunction($injectionVar){\n{$function}\n}]);";
253257
}
254258
return implode("\n", $js);
255259
}
256260

257261
/**
258262
* Render script resource
259263
* ```javascript
260-
* appName.factory(ResName,['$resource',function($resource){
264+
* module.factory(ResName,['$resource',function($resource){
261265
* return ...;
262266
* }]);
263267
* ```
@@ -280,7 +284,7 @@ protected function renderResources()
280284
}
281285

282286
$js[] = <<<JS
283-
{$this->_varName}.factory('$name',['\$resource',function(\$resource){
287+
module.factory('$name',['\$resource',function(\$resource){
284288
return \$resource({$url},{$paramDefaults},{$actions});
285289
}]);
286290
JS;

0 commit comments

Comments
 (0)