Index: lams_central/web/includes/javascript/authoring/authoringHandler.js
===================================================================
diff -u -r1a329783c6ff3378add4b1279182e37698058230 -r922ee8d48aa70d56c24a802f8e68c6dde4bef8ae
--- lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 1a329783c6ff3378add4b1279182e37698058230)
+++ lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 922ee8d48aa70d56c24a802f8e68c6dde4bef8ae)
@@ -276,10 +276,9 @@
 		      .off('mousemove');
 		
 		// if the user started adding a branching and did not finish it
-		if (layout.addBranchingStart){			
-			$('.modal-body', layout.infoDialog).empty();
+		if (layout.addBranchingStart){
 			layout.infoDialog.modal('hide');
-				
+			
 			if (layout.addBranchingStart instanceof ActivityDefs.BranchingEdgeActivity) {
 				layout.activities.splice(layout.activities.indexOf(layout.addBranchingStart), 1);
 				layout.addBranchingStart.items.remove();
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r1a329783c6ff3378add4b1279182e37698058230 -r922ee8d48aa70d56c24a802f8e68c6dde4bef8ae
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 1a329783c6ff3378add4b1279182e37698058230)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 922ee8d48aa70d56c24a802f8e68c6dde4bef8ae)
@@ -9,14 +9,10 @@
 	addAnnotationLabel : function() {
 		HandlerLib.resetCanvasMode();
 		
-		$('.modal-body', layout.infoDialog).text(LABELS.ANNOTATION_LABEL_PLACE_PROMPT);
-		layout.infoDialog.modal('show');
+		layout.infoDialog.data('show')(LABELS.ANNOTATION_LABEL_PLACE_PROMPT, true);
 
 		canvas.css('cursor', 'pointer').click(function(event){
-			$('.modal-body', layout.infoDialog).empty();
 			layout.infoDialog.modal('hide');
-
-
 			var translatedEvent = GeneralLib.translateEventOnCanvas(event),
 				x = translatedEvent[0],
 				y = translatedEvent[1];
@@ -34,13 +30,10 @@
 	addAnnotationRegion : function() {
 		HandlerLib.resetCanvasMode();
 		
-		$('.modal-body', layout.infoDialog).text(LABELS.ANNOTATION_REGION_PLACE_PROMPT);
-		layout.infoDialog.modal('show');
+		layout.infoDialog.data('show')(LABELS.ANNOTATION_REGION_PLACE_PROMPT, true);
 	
 		canvas.css('cursor', 'crosshair').mousedown(function(event){
-			$('.modal-body', layout.infoDialog).empty();
 			layout.infoDialog.modal('hide');
-			
 			var	targetElement = Snap.getElementByPoint(event.pageX, event.pageY);
 			
 			if (targetElement.type == 'svg') {
@@ -59,8 +52,7 @@
 	addBranching : function(){
 		HandlerLib.resetCanvasMode();
 		
-		$('.modal-body', layout.infoDialog).text(LABELS.BRANCHING_START_PLACE_PROMPT);
-		layout.infoDialog.modal('show');
+		layout.infoDialog.data('show')(LABELS.BRANCHING_START_PLACE_PROMPT, true);
 		
 		layout.addBranchingStart = true;
 		
@@ -81,15 +73,14 @@
 				layout.addBranchingStart = null;
 				HandlerLib.resetCanvasMode(true);
 				
-				$('.modal-body', layout.infoDialog).empty();
 				layout.infoDialog.modal('hide');
 				
 				GeneralLib.setModified(true);
 			} else {
 				// extract main branchingActivity structure from created start point
 				branchingActivity = branchingEdge.branchingActivity;
 				layout.addBranchingStart = branchingEdge;
-				$('.modal-body', layout.infoDialog).text(LABELS.BRANCHING_END_PLACE_PROMPT);
+				layout.infoDialog.data('show')(LABELS.BRANCHING_END_PLACE_PROMPT, true);
 			}
 		});
 	},
@@ -105,13 +96,10 @@
 		}
 		HandlerLib.resetCanvasMode();
 		
-		$('.modal-body', layout.infoDialog).text(LABELS.SUPPORT_ACTIVITY_PLACE_PROMPT);
-		layout.infoDialog.modal('show');
+		layout.infoDialog.data('show')(LABELS.SUPPORT_ACTIVITY_PLACE_PROMPT, true);
 	
 		canvas.css('cursor', 'pointer').click(function(event){
-			$('.modal-body', layout.infoDialog).empty();
 			layout.infoDialog.modal('hide');
-
 			var translatedEvent = GeneralLib.translateEventOnCanvas(event),
 				x = translatedEvent[0],
 				y = translatedEvent[1];
@@ -186,13 +174,10 @@
 	addOptionalActivity : function() {
 			HandlerLib.resetCanvasMode();
 			
-			$('.modal-body', layout.infoDialog).text(LABELS.OPTIONAL_ACTIVITY_PLACE_PROMPT);
-			layout.infoDialog.modal('show');
+			layout.infoDialog.data('show')(LABELS.OPTIONAL_ACTIVITY_PLACE_PROMPT, true);
 		
 			canvas.css('cursor', 'pointer').click(function(event){
-				$('.modal-body', layout.infoDialog).empty();
 				layout.infoDialog.modal('hide');
-	
 				var translatedEvent = GeneralLib.translateEventOnCanvas(event),
 					x = translatedEvent[0],
 					y = translatedEvent[1];
@@ -212,20 +197,17 @@
 		if (layout.isTransitionStarted) {
 			layout.isTransitionStarted = false;
 			HandlerLib.resetCanvasMode(true);
-			$('.modal-body', layout.infoDialog).empty();
 			layout.infoDialog.modal('hide');
 			$('#transitionButton').blur();
 		} else {
 			layout.isTransitionStarted = true;
 			HandlerLib.resetCanvasMode();
 			
-			$('.modal-body', layout.infoDialog).text(LABELS.TRANSITION_PLACE_PROMPT);
-			layout.infoDialog.modal('show');
+			layout.infoDialog.data('show')(LABELS.TRANSITION_PLACE_PROMPT, true);
 			
 			canvas.css('cursor', 'pointer').click(function(event){
 				layout.isTransitionStarted = false;
 				
-				$('.modal-body', layout.infoDialog).empty();
 				layout.infoDialog.modal('hide');
 				
 				var startActivity = null,