ADAM / AIAHTML5

Commit 25984d9d9b2926f31181700d37541b13792ebf03

Authored by Nikita Kulshreshtha
2 parents ee65ccfa 7fd3ba4a

Merge branch 'TransparencyBoxResizingIssue1' into Develop

Inline Side-by-side
Showing 2 changed files with 19 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @25984d9
... ... @@ -2881,8 +2881,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2881 2881  
2882 2882 $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
2883 2883  
  2884 + // Annotations Closing Code
  2885 +
  2886 + $('.com_anno').remove();
  2887 +
  2888 + $('#sppeachBubble_annotation').remove();
  2889 + $('#dot_annotation').remove();
  2890 + $('#bord_annotation').remove();
  2891 +
  2892 + $('#dot').remove();
  2893 + $('#sppeachBubble').remove();
  2894 + $(".com").remove();
  2895 + $("#bord").remove();
  2896 +
  2897 +
2884 2898 if (($("#canvasPaint").css("display") == "block") && ($("#canvas").css("display") == "block")){
2885   - if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == false) {
  2899 + if ($rootScope.isAnnotatiomToolBarPopupActive == false) {
2886 2900  
2887 2901 if ($("#transparencyScale").css("display") == "block") {
2888 2902 $rootScope.switchToTransparencycanvas();
... ... @@ -2902,7 +2916,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2902 2916 }
2903 2917 else
2904 2918 {
2905   - if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == true) {
  2919 + if ($rootScope.isAnnotatiomToolBarPopupActive == true) {
2906 2920  
2907 2921 $rootScope.CloseAnnotationTool();
2908 2922  
... ... @@ -6893,7 +6907,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6893 6907 $scope.male = "";
6894 6908 $scope.female = "active";
6895 6909 }
6896   -
  6910 + $rootScope.CloseAnnotationTool();
6897 6911 }
6898 6912  
6899 6913  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @25984d9
... ... @@ -511,7 +511,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
511 511 //annotation tool custom events
512 512 $rootScope.ShowAnnotationWindow = function () {
513 513 //7904
514   - $rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange = true;
  514 + $rootScope.isAnnotatiomToolBarPopupActive = true;
515 515 $rootScope.isAnnotatiomToolBarPopupClosed = false;
516 516 $rootScope.isAnnotaionToolBarDrawingModeActive = false;
517 517 if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI") {
... ... @@ -583,7 +583,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
583 583  
584 584 $rootScope.CloseAnnotationTool = function () {
585 585 console.log('close');
586   - $rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange = false;
  586 + $rootScope.isAnnotatiomToolBarPopupActive = false;
587 587 $rootScope.isAnnotatiomToolBarPopupClosed = true;
588 588 $("#OnIdentify").removeClass("annotationtoolbartab");
589 589 $("#DrawMode").removeClass("annotationtoolbartab");
... ...