fixes for trustAsHtml

for label.html it always was trusting it and form labelfor.html it was always not trusting it.
Servoy · Nov 29, 2016 · b43dc32 · b43dc32
1 parent 661d5ad
commit b43dc32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/label/label.js b/label/label.js
@@ -4,7 +4,8 @@ angular.module('bootstrapcomponentsLabel',['servoy'])
       restrict: 'E',
       scope: {
        	model: "=svyModel",
-       	handlers: "=svyHandlers"
+       	handlers: "=svyHandlers",
+       	servoyApi: "=svyServoyapi"
       },
       controller: function($scope, $element, $attrs) {
     	var templateUrl = $scope.model.labelFor ? "bootstrapcomponents/label/labelfor.html" : "bootstrapcomponents/label/label.html";

diff --git a/label/labelfor.html b/label/labelfor.html
@@ -1,6 +1,6 @@
 <label  class='bts-label' for='{{model.labelFor}}'
 	 ng-class="model.styleClass"
-	 ng-bind-html='model.text| htmlFilter'
+	 ng-bind-html='model.text| htmlFilter| trustAsHtml:servoyApi.trustAsHtml()'
 	 ng-if='model.visible'
 	 sablo-tabseq='model.tabSeq'
 	 id="{{::model.svyMarkupId}}"