ADAM / AIAHTML5

Commit 84c06ae9031897a9f2b49d662fa0cb85e57a4cd7

Authored by Amrita Vishnoi
1 parent db0b2ac4

Refs: #7398

Inline Side-by-side
Showing 1 changed file with 45 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @84c06ae
... ... @@ -884,16 +884,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
884 884 var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false;
885 885  
886 886 //set scrollbars on canvas and hide loading label
887   - // $('#daLoaderLabel').css('visibility', 'hidden')
  887 + $('#daLoaderLabel').css('visibility', 'hidden')
888 888  
889   - $('#canvasDiv').css('overflow', 'scroll')
890   - if (isiOSSafari) {
891   - $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
  889 +
  890 + $('#canvasDiv').css('overflow', 'scroll')
  891 + if (isiOSSafari) {
  892 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
  893 +
  894 + }
  895 + else {
  896 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
  897 + }
  898 +
892 899  
893   - }
894   - else {
895   - $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
896   - }
897 900 // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
898 901 $('#canvasDiv').scrollTop(50)
899 902 var abc = $rootScope.BodyRegionCordinatesData;
... ... @@ -934,6 +937,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
934 937 };
935 938 }
936 939  
  940 +
  941 +
937 942 $('#draggable').css('width', dragdivw);
938 943 $('#draggable').css('height', dragdivh)
939 944 }
... ... @@ -1387,8 +1392,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1387 1392 $scope.isEligibleForHighlight = false;
1388 1393 }
1389 1394  
1390   - if ($scope.isEligibleForHighlight == true) {
1391   - if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
  1395 + if ($scope.isEligibleForHighlight == true)
  1396 + {
  1397 + if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
1392 1398  
1393 1399 $rootScope.isLoading = false;
1394 1400 $('#spinner').css('visibility', 'hidden');
... ... @@ -1399,7 +1405,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1399 1405 //$timeout(function () {
1400 1406 console.log('inside start of flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
1401 1407 $rootScope.isHighLight = true;
1402   - console.log('just before highLightBody call');
  1408 + console.log('in FlipedImgCanvas just before highLightBody call');
1403 1409 $scope.highLightBody();
1404 1410 console.log('just after highLightBody call');
1405 1411 //}, 500);
... ... @@ -1707,7 +1713,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1707 1713 $scope.isEligibleForHighlight = false;
1708 1714 }
1709 1715  
1710   - if ($scope.isEligibleForHighlight == true) {
  1716 + if ($scope.isEligibleForHighlight == true)
  1717 + {
  1718 +
1711 1719 if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
1712 1720  
1713 1721 $rootScope.isLoading = false;
... ... @@ -1719,8 +1727,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1719 1727 //$timeout(function () {
1720 1728 console.log('inside start of non flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
1721 1729 $rootScope.isHighLight = true;
  1730 +
1722 1731 console.log('just before highLightBody call');
  1732 +
1723 1733 $scope.highLightBody();
  1734 +
1724 1735 console.log('just after highLightBody call');
1725 1736 //}, 500);
1726 1737 }
... ... @@ -4769,12 +4780,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4769 4780 }
4770 4781  
4771 4782 $scope.enableNormalMode = function () {
  4783 +
  4784 + console.log('enableNormalMode is called');
4772 4785  
  4786 +
  4787 + // $rootScope.isHighLight = false;
4773 4788  
4774   - //if listanager is visisble then close it
4775   -
4776   - // $rootScope.isListManagerSelected = false;
4777   - $rootScope.CloseListManager();
  4789 + //to do should not call every time
  4790 + $rootScope.CloseListManager();
  4791 +
4778 4792  
4779 4793 if ($rootScope.isNormalMode == true) {
4780 4794  
... ... @@ -4797,6 +4811,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4797 4811 $rootScope.isZoomed = false;
4798 4812  
4799 4813 //6.
  4814 + $rootScope.isListManagerSelected = false;
  4815 +
  4816 + //7.
4800 4817 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
4801 4818  
4802 4819  
... ... @@ -6897,10 +6914,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6897 6914 }
6898 6915  
6899 6916 $scope.jumpToTerm = function (event) {
  6917 +
  6918 +
  6919 + //1.
6900 6920 $scope.searchFilter = event.currentTarget.innerHTML;
  6921 +
  6922 + //2.
6901 6923 $scope.HighlightBodyOnListManagerSelection(event);
6902 6924  
6903 6925 $scope.IsSearchVisible = false;
  6926 + $rootScope.isNormalMode = false;
6904 6927  
6905 6928 //Highlight only Highlight button
6906 6929  
... ... @@ -7083,8 +7106,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7083 7106 $scope.HighlightBodyOnListManagerSelection = function (event) {
7084 7107  
7085 7108 $scope.terminateCurrentlyRunningWPs();
7086   - //debugger
  7109 +
7087 7110 $rootScope.isListManagerSelected = true;
  7111 +
  7112 + $rootScope.setScrollBasedOnSearch = true;
  7113 +
7088 7114 $rootScope.isLoading = true;
7089 7115  
7090 7116 $('#spinner').css('visibility', 'visible');
... ... @@ -7284,8 +7310,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7284 7310  
7285 7311  
7286 7312 console.log('newX =' + newX + ',newY= ' + newY)
7287   - $('#canvasDiv').scrollLeft(newX);
7288   - $('#canvasDiv').scrollTop(newY);
  7313 + $rootScope.xOnSearch= $('#canvasDiv').scrollLeft(newX);
  7314 + $rootScope.yOnSearch = $('#canvasDiv').scrollTop(newY);
7289 7315  
7290 7316  
7291 7317 }
... ...