Button onClick is now evaled in proper scope

It was evaled in the isolated scope of the sf-schema
direcive, now we lift it up to the parent outside.

Author: davidlgj

src/bootstrap-example.html

@@ -127,7 +127,7 @@ <h3>Schema</h3>
       type: 'actions',
       items: [
         { type: 'submit', title: 'Do It!'},
-        { type: 'button', title: 'Noooooooooooo'}
+        { type: 'button', title: 'Noooooooooooo', onClick: 'sayNo()'}
       ]
     }
   ];
@@ -167,6 +167,9 @@ <h3>Schema</h3>
   };
 
 
+  $scope.sayNo = function() {
+    alert('Noooooooo')
+  }
 
 }
 

src/directives/decorators/bootstrap/actions.html

@@ -3,9 +3,9 @@
          type="submit"
          class="btn btn-primary"
          value="{{item.title}}"
-         ng-click="buttonClick($event,form)"
          ng-if="item.type === 'submit'">
   <button ng-repeat-end class="btn btn-default"
+          type="button"
           ng-if="item.type !== 'submit'"
-          ng-click="buttonClick($event,form)">{{item.title}}</button>
+          ng-click="buttonClick($event,item)">{{item.title}}</button>
 </div>

src/directives/decorators/bootstrap/submit.html

@@ -2,9 +2,9 @@
   <input type="submit"
          class="btn btn-primary"
          value="{{form.title}}"
-         ng-click="buttonClick($event,form)"
          ng-if="form.type === 'submit'">
   <button class="btn btn-default"
+          type="button"
           ng-click="buttonClick($event,form)"
           ng-if="form.type !== 'submit'">{{form.title}}</button>
 </div>

src/directives/schema-form.js

@@ -32,6 +32,11 @@ function($compile,  schemaForm,  schemaFormDecorators){
       initialForm: '=sfForm',
       model: '=sfModel'
     },
+    controller: ['$scope',function($scope){
+      this.evalInParentScope = function(expr,locals){
+        $scope.$parent.$eval(expr,locals);
+      };
+    }],
     replace: false,
     restrict: "A",
     transclude: true,

src/services/decorators.js

@@ -38,7 +38,8 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
           replace: true,
           transclude: false,
           scope: true,
-          link: function(scope,element,attrs) {
+          require: '?^sfSchema',
+          link: function(scope,element,attrs,sfSchema) {
             //rebind our part of the form to the scope.
             var once = scope.$watch(attrs.form,function(form){
 
@@ -74,11 +75,16 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
               return lst;
             };
 
-            scope.clickButton = function($event,form) {
+            scope.buttonClick = function($event,form) {
               if (angular.isFunction(form.onClick)) {
                 form.onClick($event,form);
               } else if (angular.isString(form.onClick)) {
-                scope.$eval(form.onClick,{'$event':$event,form:form});
+                if (sfSchema) {
+                  //evaluating in scope outside of sfSchemas isolated scope
+                  sfSchema.evalInParentScope(form.onClick,{'$event':$event,form:form});
+                } else {
+                  scope.$eval(form.onClick,{'$event':$event,form:form});
+                }
               }
             };
           }

src/services/schema-form.js

@@ -5,7 +5,7 @@
  */
 angular.module('schemaForm').factory('schemaForm',[function(){
   var service = {};
-
+  
   service.merge = function(schema,form,ignore) {
     form  = form || ["*"];
 
@@ -24,7 +24,7 @@ angular.module('schemaForm').factory('schemaForm',[function(){
     //We look at the supplied form and extend it with schema standards
     var lookup = stdForm.lookup;
     return form.map(function(obj){
-
+        
       //handle the shortcut with just a name
       if (typeof obj === 'string') {
         obj = { key: obj };