Commit 05a753671369556dd63c51fdd3d3d730f9f60bb7
Merge branch '#13666Merge' into Develop
Showing
3 changed files
with
8 additions
and
36 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -3179,7 +3179,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3179,7 +3179,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 3179 | 3179 | ||
| 3180 | 3180 | ||
| 3181 | //history maintained issue | 3181 | //history maintained issue |
| 3182 | - if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "60000"; } | 3182 | + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "60000"; } |
| 3183 | 3183 | ||
| 3184 | 3184 | ||
| 3185 | 3185 | ||
| @@ -7008,6 +7008,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7008,6 +7008,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 7008 | $scope.LateralArmView = ""; | 7008 | $scope.LateralArmView = ""; |
| 7009 | $scope.MedialArmView = "active"; | 7009 | $scope.MedialArmView = "active"; |
| 7010 | } | 7010 | } |
| 7011 | + //13573 : DA > Annotations should not be display if we change the body view. | ||
| 7012 | + $rootScope.CloseAnnotationTool(); | ||
| 7013 | + | ||
| 7011 | } | 7014 | } |
| 7012 | 7015 | ||
| 7013 | //Reload DA controller event listener after setting change | 7016 | //Reload DA controller event listener after setting change |
| @@ -7543,40 +7546,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7543,40 +7546,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 7543 | 7546 | ||
| 7544 | //list manager | 7547 | //list manager |
| 7545 | $scope.$on('listManagerEvent', function (event, data) { | 7548 | $scope.$on('listManagerEvent', function (event, data) { |
| 7546 | - | ||
| 7547 | - | ||
| 7548 | - //if ($rootScope.MenuModuleName == "DA") { | ||
| 7549 | - // if ($rootScope.disableAnnotationtoolOnListManager == true) { | ||
| 7550 | - // $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); | ||
| 7551 | - // $('#slider-range-min-2').slider('disable'); | ||
| 7552 | - // } | ||
| 7553 | - //} | ||
| 7554 | - if ($rootScope.setListManagerZindex == true) | ||
| 7555 | - { | ||
| 7556 | - var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x | ||
| 7557 | - | ||
| 7558 | - var canvasZindex = $('#canvas').css("z-index"); //y | ||
| 7559 | - var listManagerZindex = $('#listManager').css("z-index"); //z | ||
| 7560 | - if (canvasPaintZindex > canvasZindex) { | ||
| 7561 | - //y = parseInt(canvasPaintZindex) + 1; | ||
| 7562 | - //if (listManagerZindex <= canvasPaintZindex) { | ||
| 7563 | - // listManagerZindex = parseInt(canvasPaintZindex) + 1; | ||
| 7564 | - // $('#listManager').css("z-index", z); | ||
| 7565 | - //} | ||
| 7566 | - //else { | ||
| 7567 | - $('#listManager').css("z-index", canvasPaintZindex); | ||
| 7568 | - // } | ||
| 7569 | - } else { | ||
| 7570 | - //y = parseInt(y) + 1; | ||
| 7571 | - $('#listManager').css("z-index", canvasZindex); | ||
| 7572 | - } | ||
| 7573 | - | ||
| 7574 | - } | ||
| 7575 | - | ||
| 7576 | - | ||
| 7577 | - | ||
| 7578 | - | ||
| 7579 | - | 7549 | + |
| 7580 | if ($rootScope.islistManagerEventAlredayDispachted == true) { | 7550 | if ($rootScope.islistManagerEventAlredayDispachted == true) { |
| 7581 | 7551 | ||
| 7582 | $('#spinner').css('visibility', 'visible'); | 7552 | $('#spinner').css('visibility', 'visible'); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -418,6 +418,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -418,6 +418,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 418 | $rootScope.isAnnotaionToolBarDrawingModeActive = false; | 418 | $rootScope.isAnnotaionToolBarDrawingModeActive = false; |
| 419 | 419 | ||
| 420 | $rootScope.switchCanvas(); | 420 | $rootScope.switchCanvas(); |
| 421 | + $rootScope.shapeType = ''; | ||
| 421 | } | 422 | } |
| 422 | $rootScope.CIAnotationIdentifyModeOff = false; | 423 | $rootScope.CIAnotationIdentifyModeOff = false; |
| 423 | $rootScope.OnIdentifyClick = function () { | 424 | $rootScope.OnIdentifyClick = function () { |
| @@ -1470,6 +1471,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -1470,6 +1471,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 1470 | $rootScope.lastX; $rootScope.lastY; | 1471 | $rootScope.lastX; $rootScope.lastY; |
| 1471 | var ctx; | 1472 | var ctx; |
| 1472 | $rootScope.OnPaintCanvasMouseDown = function (event) { | 1473 | $rootScope.OnPaintCanvasMouseDown = function (event) { |
| 1474 | + | ||
| 1473 | if ($rootScope.isAnnotatiomToolBarPopupClosed == false) { | 1475 | if ($rootScope.isAnnotatiomToolBarPopupClosed == false) { |
| 1474 | var canvasElement = document.getElementById("canvas"); | 1476 | var canvasElement = document.getElementById("canvas"); |
| 1475 | var ctx = canvasElement.getContext("2d"); | 1477 | var ctx = canvasElement.getContext("2d"); |
400-SOURCECODE/AIAHTML5.Web/index.html