Refs: #7398

Amrita Vishnoi
1 parent db0b2ac4
Showing 1 changed file with 45 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -884,16 +884,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false;
         //set scrollbars on canvas and hide loading label
-        // $('#daLoaderLabel').css('visibility', 'hidden')
+         $('#daLoaderLabel').css('visibility', 'hidden')
-        $('#canvasDiv').css('overflow', 'scroll')
-        if (isiOSSafari) {
-            $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
+        
+            $('#canvasDiv').css('overflow', 'scroll')
+            if (isiOSSafari) {
+                $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
+
+            }
+            else {
+                $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+            }
+        
-        }
-        else {
-            $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
-        }
         // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
         $('#canvasDiv').scrollTop(50)
         var abc = $rootScope.BodyRegionCordinatesData;
@@ -934,6 +937,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             };
         }
+       
+
         $('#draggable').css('width', dragdivw);
         $('#draggable').css('height', dragdivh)
     }
@@ -1387,8 +1392,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         $scope.isEligibleForHighlight = false;
                     }
-                    if ($scope.isEligibleForHighlight == true) {
-                        if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
+                    if ($scope.isEligibleForHighlight == true)
+                    {
+                      if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
                             $rootScope.isLoading = false;
                             $('#spinner').css('visibility', 'hidden');
@@ -1399,7 +1405,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             //$timeout(function () {
                             console.log('inside start of flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
                             $rootScope.isHighLight = true;
-                            console.log('just before highLightBody call');
+                            console.log('in FlipedImgCanvas just before highLightBody call');
                             $scope.highLightBody();
                             console.log('just after highLightBody call');
                             //}, 500);
@@ -1707,7 +1713,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             $scope.isEligibleForHighlight = false;
                         }
-                        if ($scope.isEligibleForHighlight == true) {
+                        if ($scope.isEligibleForHighlight == true)
+                        {
+                            
                             if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
                                 $rootScope.isLoading = false;
@@ -1719,8 +1727,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                 //$timeout(function () {
                                 console.log('inside start of non flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
                                 $rootScope.isHighLight = true;
+
                                 console.log('just before highLightBody call');
+
                                 $scope.highLightBody();
+
                                 console.log('just after highLightBody call');
                                 //}, 500);
                             }
@@ -4769,12 +4780,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.enableNormalMode = function () {
+              
+        console.log('enableNormalMode is called');
+       
+       // $rootScope.isHighLight = false;
-        //if listanager is visisble then close it
-
-       // $rootScope.isListManagerSelected = false;
-        $rootScope.CloseListManager();
+            //to do should not call every time
+            $rootScope.CloseListManager();
+    
         if ($rootScope.isNormalMode == true) {
@@ -4797,6 +4811,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.isZoomed = false;
             //6.
+            $rootScope.isListManagerSelected = false;
+
+            //7.
             $scope.CalculateImageCordinates($rootScope.viewOrientationId);
@@ -6897,10 +6914,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.jumpToTerm = function (event) {
+
+      
+        //1.
         $scope.searchFilter = event.currentTarget.innerHTML;
+
+        //2.
         $scope.HighlightBodyOnListManagerSelection(event);
         $scope.IsSearchVisible = false;
+        $rootScope.isNormalMode = false;
         //Highlight only Highlight button
@@ -7083,8 +7106,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.HighlightBodyOnListManagerSelection = function (event) {
         $scope.terminateCurrentlyRunningWPs();
-        //debugger
+      
         $rootScope.isListManagerSelected = true;
+
+        $rootScope.setScrollBasedOnSearch = true;
+
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -7284,8 +7310,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         console.log('newX =' + newX + ',newY= ' + newY)
-        $('#canvasDiv').scrollLeft(newX);
-        $('#canvasDiv').scrollTop(newY);
+        $rootScope.xOnSearch= $('#canvasDiv').scrollLeft(newX);
+        $rootScope.yOnSearch = $('#canvasDiv').scrollTop(newY);
     }