merged directive definition with its controller

jadjoubran · Jan 18, 2016 · 944992f · 944992f
1 parent 6de4728
commit 944992f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 35 deletions.
diff --git a/config/generators.php b/config/generators.php
@@ -34,21 +34,17 @@
       ],
       'prefixFileNames' => [
             /*
-             * Angular controller 
+             * Angular controller
              */
             'controller'      => '.controller.js',
             /*
-             * Angular directive 
+             * Angular directive
              */
             'directive'       => '.directive.js',
             /*
-             * Angular dialog 
+             * Angular dialog
              */
             'dialog'          => '.dialog.js',
-            /*
-             * Angular definition 
-             */
-            'definition'      => '.definition.js',
             /*
              * Angular service
              */

diff --git a/src/Console/Commands/AngularDirective.php b/src/Console/Commands/AngularDirective.php
@@ -44,13 +44,11 @@ public function handle()
 
         $html = file_get_contents(__DIR__.'/Stubs/AngularDirective/directive.html.stub');
         $js = file_get_contents(__DIR__.'/Stubs/AngularDirective/directive.js.stub');
-        $definition = file_get_contents(__DIR__.'/Stubs/AngularDirective/definition.js.stub');
         $less = file_get_contents(__DIR__.'/Stubs/AngularDirective/directive.less.stub');
 
         $js = str_replace('{{StudlyName}}', $studly_name, $js);
-        $definition = str_replace('{{StudlyName}}', $studly_name, $definition);
-        $definition = str_replace('{{name}}', $name, $definition);
-        $definition = str_replace('{{directiveName}}', $directive_name, $definition);
+        $js = str_replace('{{name}}', $name, $js);
+        $js = str_replace('{{directiveName}}', $directive_name, $js);
 
         $folder = base_path(config('generators.source.main')).'/'.config('generators.source.directives').'/'.$name;
         if (is_dir($folder)) {
@@ -65,10 +63,7 @@ public function handle()
         //create view (.html)
         File::put($folder.'/'.$name.'.html', $html);
 
-        //create definition (.js)
-        File::put($folder.'/'.$name.config('generators.prefixFileNames.definition'), $definition);
-
-        //create controller (.js)
+        //create directive (.js)
         File::put($folder.'/'.$name.config('generators.prefixFileNames.directive'), $js);
 
         //create less file (.less)

diff --git a/src/Console/Commands/Stubs/AngularDirective/definition.js.stub b/src/Console/Commands/Stubs/AngularDirective/definition.js.stub
diff --git a/src/Console/Commands/Stubs/AngularDirective/directive.js.stub b/src/Console/Commands/Stubs/AngularDirective/directive.js.stub
@@ -1,7 +1,21 @@
 (function(){
     "use strict";
 
-    angular.module('app.controllers').controller('{{StudlyName}}Controller', {{StudlyName}}Controller);
+    angular.module('app.directives').directive('{{directiveName}}', {{directiveName}}Directive);
+
+    function {{directiveName}}Directive() {
+
+        var directive = {
+          restrict: 'EA',
+          templateUrl: './views/directives/{{name}}/{{name}}.html',
+          controller: '{{StudlyName}}Controller',
+          controllerAs: 'vm',
+          scope: {},
+          bindToController: true
+        };
+
+        return directive;
+    }
 
     function {{StudlyName}}Controller(){
         var vm = this;