Merge commit '616d3552ed0f5ecc32152163f9c3b27738f15ce4' into ghub_master

RestComm · Jun 3, 2015 · f77d4e6 · f77d4e6
2 parents ca4446b + 616d355
commit f77d4e6
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 2 deletions.
diff --git a/restcomm/restcomm.rvd/src/main/webapp/app.js b/restcomm/restcomm.rvd/src/main/webapp/app.js
@@ -1,4 +1,16 @@
-var App = angular.module('Rvd', ['angularFileUpload','ngRoute','ngDragDrop','ui.bootstrap','ui.bootstrap.collapse','ui.bootstrap.popover','ui.sortable','basicDragdrop','pascalprecht.translate']);
+var App = angular.module('Rvd', [
+	'angularFileUpload',
+	'ngRoute',
+	'ngDragDrop',
+	'ui.bootstrap',
+	'ui.bootstrap.collapse',
+	'ui.bootstrap.popover',
+	'ui.sortable',
+	'basicDragdrop',
+	'pascalprecht.translate',
+	'ngSanitize'
+]);
+
 var rvdMod = App;
 
 App.config([ '$routeProvider', '$translateProvider', function($routeProvider, $translateProvider) {

diff --git a/restcomm/restcomm.rvd/src/main/webapp/index.html b/restcomm/restcomm.rvd/src/main/webapp/index.html
@@ -100,6 +100,9 @@
 	<script src="js/sortable.js"></script>
     <script src="js/ui-bootstrap-tpls-0.10.0.js"></script>
     <script src="js/basic-dragdrop.js"></script>
+    <script src="js/angular-sanitize.min.js"></script>
+
+
 
 	<script src="app.js"></script>	
 

diff --git a/restcomm/restcomm.rvd/src/main/webapp/js/angular-sanitize.min.js b/restcomm/restcomm.rvd/src/main/webapp/js/angular-sanitize.min.js
diff --git a/restcomm/restcomm.rvd/src/main/webapp/js/angular-sanitize.min.js.map b/restcomm/restcomm.rvd/src/main/webapp/js/angular-sanitize.min.js.map
diff --git a/restcomm/restcomm.rvd/src/main/webapp/js/app/services.js b/restcomm/restcomm.rvd/src/main/webapp/js/app/services.js
@@ -241,6 +241,9 @@ angular.module('Rvd').service('webTriggerService', ['$http','$q','$modal', funct
 			if ($scope.ccInfo == null)
 				$scope.ccInfo = createCcInfo();
 		}	
+		$scope.getWebTriggerUrl = function () {
+			return "http://" + $location.host() + ":" +  $location.port() + "/restcomm-rvd/services/apps/" +  encodeURIComponent(projectName) + '/start<span class="text-muted">?from=12345&amp;to=+1231231231&amp;token=mysecret</span>';
+		};
 		$scope.getRvdHost = function() {
 			return $location.host();
 		}

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/webTriggerModal.html b/restcomm/restcomm.rvd/src/main/webapp/templates/webTriggerModal.html
@@ -12,7 +12,7 @@ <h3 class="modal-title"><i class="fa fa-cog"></i> {{'webTriggerModalHeaderLabel'
 		<div class="form-group">
 			<h5><strong>{{'webTriggerModalWebTriggerUrlLabel' | translate}}</strong></h5>
 			<div>
-				<i>http://{{getRvdHost()}}:{{getRvdPort()}}/restcomm-rvd/services/apps/{{projectName}}/start<span class="text-muted">?from=12345&amp;to=+1231231231&amp;token=mysecret</span></i>
+				<i ng-bind-html="getWebTriggerUrl()"></i>
 			</div>
 			<div class="help-block">
 				<small>{{'webTriggerModalWebTriggerUrlHelp1' | translate}} <code>{{'webTriggerModalWebTriggerUrlHelp2' | translate}}</code> {{'webTriggerModalWebTriggerUrlHelp3' | translate}} <code>{{'webTriggerModalWebTriggerUrlHelp4' | translate}}</code> {{'webTriggerModalWebTriggerUrlHelp5' | translate}} <i>{{'webTriggerModalWebTriggerUrlHelp6' | translate}}</i> {{'webTriggerModalWebTriggerUrlHelp7' | translate}} <em>{{'webTriggerModalWebTriggerUrlHelp8' | translate}}</em> {{'webTriggerModalWebTriggerUrlHelp9' | translate}}</small>