replaces ng-bind-html-unsafe to ng-bind-html

on current angular version this is not available anymore closes #28
lmenezes · Dec 9, 2013 · 39d7226 · 39d7226
1 parent f4745e3
commit 39d7226
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/dist/kopf.js b/dist/kopf.js
@@ -1554,9 +1554,9 @@ function CreateIndexController($scope, $location, $timeout, AlertService) {
 		$scope.replicas = '';
 	}
 }
-function GlobalController($scope, $location, $timeout, ConfirmDialogService, AlertService) {
+function GlobalController($scope, $location, $timeout, $sce, ConfirmDialogService, AlertService) {
 	$scope.dialog = ConfirmDialogService;
-	$scope.version = "0.3";
+	$scope.version = "0.3.1";
 	$scope.username = null;
 	$scope.password = null;
 	$scope.alerts_service = AlertService;
@@ -1644,7 +1644,7 @@ function GlobalController($scope, $location, $timeout, ConfirmDialogService, Ale
 
 	$scope.displayInfo=function(title,info) {
 		$scope.modal.title = title;
-		$scope.modal.info = jsonTree.create(info);
+		$scope.modal.info = $sce.trustAsHtml(jsonTree.create(info));
 		$('#modal_info').modal({show:true,backdrop:true});
 	}
 

diff --git a/modals/modal_info.html b/modals/modal_info.html
@@ -6,7 +6,7 @@
         <h4 class="modal-title">{{modal.title}}</h4>
       </div>
       <div class="modal-body">
-        <pre class="modal-json response-pre" ng-bind-html-unsafe="modal.info"></pre>
+        <pre class="modal-json response-pre" ng-bind-html="modal.info"></pre>
       </div>
     </div>
   </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elasticsearch-kopf",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "kopf - simple web administration tool for ElasticSearch",
   "main": "index.html",
   "scripts": {

diff --git a/src/kopf/controllers/global.js b/src/kopf/controllers/global.js
@@ -1,6 +1,6 @@
-function GlobalController($scope, $location, $timeout, ConfirmDialogService, AlertService) {
+function GlobalController($scope, $location, $timeout, $sce, ConfirmDialogService, AlertService) {
 	$scope.dialog = ConfirmDialogService;
-	$scope.version = "0.3";
+	$scope.version = "0.3.1";
 	$scope.username = null;
 	$scope.password = null;
 	$scope.alerts_service = AlertService;
@@ -88,7 +88,7 @@ function GlobalController($scope, $location, $timeout, ConfirmDialogService, Ale
 
 	$scope.displayInfo=function(title,info) {
 		$scope.modal.title = title;
-		$scope.modal.info = jsonTree.create(info);
+		$scope.modal.info = $sce.trustAsHtml(jsonTree.create(info));
 		$('#modal_info').modal({show:true,backdrop:true});
 	}