diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 89fac5f..88d50b7 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -3635,7 +3635,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// we decide the size of speech bubble
//2.
- if (event.ctrlKey) {
+ if (event.ctrlKey) {
console.log('ctrl pressed');
$scope.multiAnnotationIsON = true;
//2.1 create unique speech bubbles
@@ -3754,12 +3754,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
});
}
}
+
if (document.getElementById("btnStrutureBox").name == "showAnnotationStructure") {
$scope.showAnnotation()
}
else {
$scope.hideAnnotation()
}
+
if ($rootScope.isTBCompleted == true) {
$('#sppeachBubble').remove();
$('#dot').remove();
@@ -4029,7 +4031,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
}
$scope.createSpeechBubbleBasedOnTransparencyWithoutCtrl = function (x, y) {
-
+ $("#bord_annotation").remove();
+ $("#sppeachBubble_annotation").remove();
+ $("#dot_annotation").remove();
var sppechBubbleDotHTML_annotation = '
'
+ ''
+ ''
@@ -6982,7 +6986,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.enableShowHideStructureBox = function () {
-
+
//if listanager is visisble then close it
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index c9c5adc..db73a44 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -3633,7 +3633,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
}
$rootScope.CloseListManager = function () {
-
$("#btnTranparency").removeAttr('disabled', 'disabled');
$("#optionsListManagerTab").removeClass("active");
$rootScope.isListManagerMenuSelected = false;
@@ -3649,7 +3648,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$("#annotationpainteraser").removeAttr('disabled', 'disabled');
$("#annotationpaintbrushsize").css('pointer-events', 'auto');
$("#annotationpainteraser").css('pointer-events', 'auto');
- $rootScope.switchCanvasToPaintCanvas();
+ if ($(".annotationTollbar").css("display") == "block") {
+ $rootScope.switchCanvasToPaintCanvas();
+ }
}
}
if ($location.path() == "/module-item-view") {