Merge branch 'Bugs_v2' into Develop

Nikita Kulshreshtha
2 parents 00d18c9d c104acf4
Showing 2 changed files with 14 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -371,7 +371,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.openView = function ($event) {
-
+        $rootScope.disableAnnotationTBFn();
+      
         $rootScope.currentBodyViewId = $event.currentTarget.id;
         if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
             var CITitle = [];
@@ -400,9 +401,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         //console.log($location.url('/clinical-animations-detail'));
     }
-
+  
     $scope.openBodyView = function () {
-
+       
+        if ($rootScope.disableAnnotationTB == true)
+        {
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
+            $('#slider-range-min-2').slider('disable');
+        }
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.voId = localStorage.getItem("currentBodyViewId");
@@ -1796,8 +1796,11 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $rootScope.lastX = x; $rootScope.lastY = y;
         }
-
-
+        $rootScope.disableAnnotationTB = false;
+        $rootScope.disableAnnotationTBFn = function()
+        {
+            $rootScope.disableAnnotationTB = true;
+        }
         //list manager function