ADAM / AIAHTML5

Commit 3f0d14154d426e050d848e095a86198954bedbff

Authored by unknown
1 parent f562c0f0

Commit Changes

Inline Side-by-side
Showing 2 changed files with 10 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3f0d141
@@ -3635,7 +3635,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3635,7 +3635,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3635 // we decide the size of speech bubble 3635 // we decide the size of speech bubble
3636 //2. 3636 //2.
3637 3637
3638 - if (event.ctrlKey) { 3638 + if (event.ctrlKey) {
3639 console.log('ctrl pressed'); 3639 console.log('ctrl pressed');
3640 $scope.multiAnnotationIsON = true; 3640 $scope.multiAnnotationIsON = true;
3641 //2.1 create unique speech bubbles 3641 //2.1 create unique speech bubbles
@@ -3754,12 +3754,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3754,12 +3754,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3754 }); 3754 });
3755 } 3755 }
3756 } 3756 }
  3757 +
3757 if (document.getElementById("btnStrutureBox").name == "showAnnotationStructure") { 3758 if (document.getElementById("btnStrutureBox").name == "showAnnotationStructure") {
3758 $scope.showAnnotation() 3759 $scope.showAnnotation()
3759 } 3760 }
3760 else { 3761 else {
3761 $scope.hideAnnotation() 3762 $scope.hideAnnotation()
3762 } 3763 }
  3764 +
3763 if ($rootScope.isTBCompleted == true) { 3765 if ($rootScope.isTBCompleted == true) {
3764 $('#sppeachBubble').remove(); 3766 $('#sppeachBubble').remove();
3765 $('#dot').remove(); 3767 $('#dot').remove();
@@ -4029,7 +4031,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4029,7 +4031,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4029 } 4031 }
4030 } 4032 }
4031 $scope.createSpeechBubbleBasedOnTransparencyWithoutCtrl = function (x, y) { 4033 $scope.createSpeechBubbleBasedOnTransparencyWithoutCtrl = function (x, y) {
4032 - 4034 + $("#bord_annotation").remove();
  4035 + $("#sppeachBubble_annotation").remove();
  4036 + $("#dot_annotation").remove();
4033 var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:59000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>' 4037 var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:59000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
4034 + '<div id="sppeachBubble_annotation" style="height:auto!important;z-index:60000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;font-weight:bold;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">' 4038 + '<div id="sppeachBubble_annotation" style="height:auto!important;z-index:60000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;font-weight:bold;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
4035 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">' 4039 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
@@ -6982,7 +6986,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6982,7 +6986,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6982 6986
6983 $scope.enableShowHideStructureBox = function () { 6987 $scope.enableShowHideStructureBox = function () {
6984 6988
6985 - 6989 +
6986 //if listanager is visisble then close it 6990 //if listanager is visisble then close it
6987 6991
6988 6992
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @3f0d141
@@ -3633,7 +3633,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3633,7 +3633,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3633 } 3633 }
3634 3634
3635 $rootScope.CloseListManager = function () { 3635 $rootScope.CloseListManager = function () {
3636 -  
3637 $("#btnTranparency").removeAttr('disabled', 'disabled'); 3636 $("#btnTranparency").removeAttr('disabled', 'disabled');
3638 $("#optionsListManagerTab").removeClass("active"); 3637 $("#optionsListManagerTab").removeClass("active");
3639 $rootScope.isListManagerMenuSelected = false; 3638 $rootScope.isListManagerMenuSelected = false;
@@ -3649,7 +3648,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3649,7 +3648,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3649 $("#annotationpainteraser").removeAttr('disabled', 'disabled'); 3648 $("#annotationpainteraser").removeAttr('disabled', 'disabled');
3650 $("#annotationpaintbrushsize").css('pointer-events', 'auto'); 3649 $("#annotationpaintbrushsize").css('pointer-events', 'auto');
3651 $("#annotationpainteraser").css('pointer-events', 'auto'); 3650 $("#annotationpainteraser").css('pointer-events', 'auto');
3652 - $rootScope.switchCanvasToPaintCanvas(); 3651 + if ($(".annotationTollbar").css("display") == "block") {
  3652 + $rootScope.switchCanvasToPaintCanvas();
  3653 + }
3653 } 3654 }
3654 } 3655 }
3655 if ($location.path() == "/module-item-view") { 3656 if ($location.path() == "/module-item-view") {