angular & rest

Author: mdmunir

DeeAngularAsset.php DeeAngularRestAsset.phpDeeAngularAsset.php renamed to DeeAngularRestAsset.php

@@ -8,7 +8,7 @@
  * @author Misbahul D Munir <misbahuldmunir@gmail.com>
  * @since 1.0
  */
-class DeeAngularAsset extends \yii\web\AssetBundle
+class DeeAngularRestAsset extends \yii\web\AssetBundle
 {
     /**
      * @inheritdoc
@@ -20,16 +20,12 @@ class DeeAngularAsset extends \yii\web\AssetBundle
      */
     public $js = [
         'js/dee-angular-rest.js',
-        'js/dee-angular-ui.js',
-        'js/dee-angular.js',
     ];
 
     /**
      * @inheritdoc
      */
     public $depends = [
-        'yii\web\JqueryAsset',
-        'dee\angular\AngularAsset',
         'dee\angular\AngularResourceAsset',
     ];
 

DeeAngularUiAsset.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace dee\angular;
+
+/**
+ * AngularAsset
+ *
+ * @author Misbahul D Munir <misbahuldmunir@gmail.com>
+ * @since 1.0
+ */
+class DeeAngularUiAsset extends \yii\web\AssetBundle
+{
+    /**
+     * @inheritdoc
+     */
+    public $sourcePath = '@dee/angular/assets';
+
+    /**
+     * @inheritdoc
+     */
+    public $js = [
+        'js/dee-angular-ui.js',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public $depends = [
+        'dee\angular\AngularAsset',
+    ];
+
+}

NgView.php

@@ -74,14 +74,15 @@ class NgView extends Widget
      */
     public static $requireAssets = [
         'ui.bootstrap' => 'dee\angular\AngularBootstrapAsset',
-        'dee' => 'dee\angular\DeeAngularAsset',
+        'dee.ui' => 'dee\angular\DeeAngularUiAsset',
+        'dee.rest' => 'dee\angular\DeeAngularRestAsset',
         'ngRoute' => 'dee\angular\AngularRouteAsset',
         'ngResource' => 'dee\angular\AngularResourceAsset',
         'ngAnimate' => 'dee\angular\AngularAnimateAsset',
         'ngAria' => 'dee\angular\AngularAnimateAsset',
         'ngTouch' => 'dee\angular\AngularAnimateAsset',
         'validation' => 'dee\angular\AngularValidationAsset',
-        'validation.rule'=>'dee\angular\AngularValidationAsset'
+        'validation.rule' => 'dee\angular\AngularValidationAsset',
     ];
     private $_varName;
 
@@ -113,9 +114,9 @@ public function run()
             $visible = ArrayHelper::remove($route, 'visible', true);
             list($routeProvider, $controller, $template) = $this->applyRoute($route, $path);
 
-            if($path === 'otherwise'){
+            if ($path === 'otherwise') {
                 $routeProviders[] = "\$routeProvider.otherwise({$routeProvider});";
-            }elseif ($visible) {
+            } elseif ($visible) {
                 $p = Json::htmlEncode($path);
                 $routeProviders[] = "\$routeProvider.when({$p},{$routeProvider});";
             }
@@ -134,8 +135,13 @@ public function run()
         $js[] = $this->renderRouteProviders($routeProviders);
         $js[] = $this->renderControllers($controllers);
         $js[] = $this->renderResources();
+        if ($this->js !== null) {
+            foreach ((array)$this->js as $file) {
+                $js[] = "\n" . static::parseBlockJs($view->render($file));
+            }
+        }
 
-        $options = empty($this->clientOptions)?'{}':  Json::htmlEncode($this->clientOptions);
+        $options = empty($this->clientOptions) ? '{}' : Json::htmlEncode($this->clientOptions);
         $js[] = "\nreturn module;\n})({$options});";
 
         $view->registerJs(implode("\n", $js), WebView::POS_END);
@@ -214,10 +220,6 @@ protected function renderModule()
         }
         $js = "var module = angular.module('{$this->name}'," . Json::htmlEncode($requires) . ");\n"
             . "var {$this->_varName} = module;";
-
-        if ($this->js !== null) {
-            $js .= "\n" . static::parseBlockJs($view->render($this->js));
-        }
         return $js;
     }
 
@@ -252,7 +254,7 @@ protected function renderControllers($controllers)
         $view = $this->getView();
         foreach ($controllers as $name => $injection) {
             $injection = array_unique(array_merge(['$scope', '$injector'], (array) $injection));
-            $injectionStr = rtrim(Json::htmlEncode($injection),']');
+            $injectionStr = rtrim(Json::htmlEncode($injection), ']');
             $injectionVar = implode(", ", $injection);
             $function = implode("\n", ArrayHelper::getValue($view->js, $name, []));
             $js[] = "module.controller('$name',{$injectionStr},\nfunction($injectionVar){\n{$function}\n}]);";

assets/js/dee-angular-ui.js

@@ -62,4 +62,22 @@
                 }
             };
         }]);
+    
+    module.factory('$pageInfo', function () {
+        var pub = function (callback, info) {
+            var res = {}, p = info || {};
+            angular.forEach(pub.pagerHeaderMap, function (val, key) {
+                res[key] = p[key] = callback(val);
+            });
+        };
+        
+        pub.pagerHeaderMap = {
+            totalItems: 'X-Pagination-Total-Count',
+            pageCount: 'X-Pagination-Page-Count',
+            page: 'X-Pagination-Current-Page',
+            itemPerPage: 'X-Pagination-Per-Page',
+        };
+
+        return pub;
+    });
 })();