From: Tim Otten <totten@civicrm.org>
Date: Mon, 16 Mar 2015 01:25:42 +0000 (-0700)
Subject: crmUiField - Remove double-$parent
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dab51d0aee7f5e6332f029f3988ef06393ed70ef;p=civicrm-core.git

crmUiField - Remove double-$parent
---

diff --git a/js/angular-crm-ui.js b/js/angular-crm-ui.js
index e68b3a10f7..e46f814b1f 100644
--- a/js/angular-crm-ui.js
+++ b/js/angular-crm-ui.js
@@ -129,9 +129,9 @@
           // string, e.g. "myform.myfield"
           crmUiField: '@',
           // string, an expression producing a printable title
-          crmTitle: '@',
+          crmTitle: '=',
           // string, an expression producing a help id
-          crmHelp: '@'
+          crmHelp: '='
         },
         templateUrl: function(tElement, tAttrs){
           var layout = tAttrs.crmLayout ? tAttrs.crmLayout : 'default';
@@ -141,9 +141,7 @@
         link: function (scope, element, attrs, crmUiIdCtrl) {
           $(element).addClass('crm-section');
           scope.crmUiField = attrs.crmUiField;
-          scope.crmTitle = attrs.crmTitle;
-          scope.crmHelp = attrs.crmHelp;
-          scope.crmUiHelpFile = scope.$parent.crmUiHelpFile;
+          scope.crmUiHelpFile = scope.$parent.crmUiHelpFile; // propagate default
         }
       };
     })
diff --git a/partials/crmUi/field-cb.html b/partials/crmUi/field-cb.html
index 860454e15e..5428b7316e 100644
--- a/partials/crmUi/field-cb.html
+++ b/partials/crmUi/field-cb.html
@@ -1,7 +1,7 @@
 <label crm-depth="1">
   <span ng-transclude></span>
   <span ng-class="cssClasses">
-    {{$parent.$parent.$eval(crmTitle)}}
+    {{crmTitle}}
   </span>
 </label>
 <div class="clear"></div>
diff --git a/partials/crmUi/field.html b/partials/crmUi/field.html
index 7f27ae342d..5667526b47 100644
--- a/partials/crmUi/field.html
+++ b/partials/crmUi/field.html
@@ -1,6 +1,6 @@
 <div class="label">
-  <label crm-ui-for="{{crmUiField}}" crm-depth="1">{{$parent.$parent.$eval(crmTitle)}}</label>
-  <a crm-ui-help="{title: $parent.$parent.$eval(crmTitle), id: $parent.$parent.$eval(crmHelp), file: $parent.crmUiHelpFile}" ng-if="crmHelp"></a>
+  <label crm-ui-for="{{crmUiField}}" crm-depth="1">{{crmTitle}}</label>
+  <a crm-ui-help="{title: crmTitle, id: crmHelp}" ng-if="crmHelp"></a>
 </div>
 <div class="content" ng-transclude></div>
 <div class="clear"></div>