Address reviews

app/assets/javascripts/components/miq-button.js

@@ -7,8 +7,9 @@ ManageIQ.angular.app.component('miqButton', {
     primary: '<?',
     onClick: '&',
   },
+  controllerAs: 'vm',
   controller: function() {
-    this.buttonClicked = function($event) {
+    this.buttonClicked = function() {
       if (this.enabled) {
         this.onClick();
       }
@@ -30,11 +31,12 @@ ManageIQ.angular.app.component('miqButton', {
   },
   template: [
     '<button',
-    'ng-class="{btn: true, \'btn-primary\': $ctrl.primary, \'btn-default\': !$ctrl.primary, disabled: !$ctrl.enabled}"',
-    'ng-click="$ctrl.buttonClicked()"',
-    'ng-attr-title="{{$ctrl.title}}"',
-    'ng-attr-alt="{{$ctrl.title}}">',
-    '{{$ctrl.name}}',
+    'controllerAs="vm"',
+    'ng-class="{btn: true, \'btn-primary\': vm.primary, \'btn-default\': !vm.primary, disabled: !vm.enabled}"',
+    'ng-click="vm.buttonClicked()"',
+    'ng-attr-title="{{vm.title}}"',
+    'ng-attr-alt="{{vm.title}}">',
+    '{{vm.name}}',
     '</button>'
   ].join("\n")
 });

app/views/layouts/angular/_form_button_submit_angular.html.haml

@@ -3,7 +3,7 @@
 - confirm ||= ""
 - ng_show ||= true
 
-%div{"ng-show" => ng_show}
+%div{"ng-show" => ng_show, "ng-controller" => "buttonGroupController"}
   %miq-button{:name            => _("Submit"),
               "disabled-title" => submit_title_off,
               "enabled-title"  => submit_title_on,

app/views/layouts/angular/_x_custom_form_buttons_angular.html.haml

@@ -1,18 +1,18 @@
 .clearfix
 .pull-right.button-group{"ng-controller" => "buttonGroupController"}
   %miq-button{:name      => button_label,
-                :title     => button_label,
-                :alt       => button_label,
-                :enabled   => "saveable(angularForm)",
-                'on-click' => button_click,
-                :primary   => 'true'}
+              :title     => button_label,
+              :alt       => button_label,
+              :enabled   => "saveable(angularForm)",
+              'on-click' => button_click,
+              :primary   => 'true'}
   %miq-button{:name      => t = _("Reset"),
-                :title     => t,
-                :alt       => t,
-                :enabled   => '!angularForm.$pristine',
-                'ng-show'  => '!newRecord',
-                'on-click' => "resetClicked()"}
+              :title     => t,
+              :alt       => t,
+              :enabled   => '!angularForm.$pristine',
+              'ng-show'  => '!newRecord',
+              'on-click' => "resetClicked()"}
   %miq-button{:name      => t = _("Cancel"),
-                :title     => t,
-                :alt       => t,
-                'on-click' => "cancelClicked($event)"}
+              :title     => t,
+              :alt       => t,
+              'on-click' => "cancelClicked($event)"}

app/views/layouts/angular/_x_edit_buttons_angular.html.haml

@@ -11,7 +11,7 @@
               :title     => t,
               :alt       => t,
               'ng-show'  => '!newRecord',
-              :enabled   => "miqService.saveable(angularForm)",
+              :enabled   => "saveable(angularForm)",
               'on-click' => "saveClicked({target: '.edit_buttons'}, true)",
               :primary   => 'true'}
   %miq-button{:name      => t = _("Reset"),

spec/javascripts/components/miq-button_spec.js

@@ -26,6 +26,7 @@ describe('miq-button', function() {
         done();
       });
     });
+
     it('should disable button if form is invalid', function(done) {
       $scope.validForm = false;
       $scope.$digest();
@@ -62,8 +63,7 @@ describe('miq-button', function() {
           button.trigger("click");
           if (item) {
             expect($scope.miqButtonClicked).toHaveBeenCalled();
-          }
-          else {
+          } else {
             expect($scope.miqButtonClicked).not.toHaveBeenCalled();
           }
         });
@@ -87,6 +87,7 @@ describe('miq-button', function() {
       element = $compile(element)($scope);
       $scope.$digest();
     }));
+
     it('should set button attributes and classes correctly', function(done) {
       setTimeout(function(){
         var button = element.find("miq-button > button");