ADAM / AIAHTML5

Commit c23d5c511ce95d98d401d052c9dce54661c70659

Authored by Nikita Kulshreshtha
2 parents 00d18c9d c104acf4

Merge branch 'Bugs_v2' into Develop

Inline Side-by-side
Showing 2 changed files with 14 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @c23d5c5
... ... @@ -371,7 +371,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
371 371  
372 372  
373 373 $scope.openView = function ($event) {
374   -
  374 + $rootScope.disableAnnotationTBFn();
  375 +
375 376 $rootScope.currentBodyViewId = $event.currentTarget.id;
376 377 if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
377 378 var CITitle = [];
... ... @@ -400,9 +401,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
400 401 //console.log($location.url('/clinical-animations-detail'));
401 402  
402 403 }
403   -
  404 +
404 405 $scope.openBodyView = function () {
405   -
  406 +
  407 + if ($rootScope.disableAnnotationTB == true)
  408 + {
  409 + $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
  410 + $('#slider-range-min-2').slider('disable');
  411 + }
406 412 $rootScope.isLoading = true;
407 413 $('#spinner').css('visibility', 'visible');
408 414 $scope.voId = localStorage.getItem("currentBodyViewId");
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c23d5c5
... ... @@ -1796,8 +1796,11 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1796 1796 $rootScope.lastX = x; $rootScope.lastY = y;
1797 1797 }
1798 1798  
1799   -
1800   -
  1799 + $rootScope.disableAnnotationTB = false;
  1800 + $rootScope.disableAnnotationTBFn = function()
  1801 + {
  1802 + $rootScope.disableAnnotationTB = true;
  1803 + }
1801 1804  
1802 1805 //list manager function
1803 1806  
... ...