Commit 5f00d81827696cf115fc3d7685f8bd1e6731b688

Authored by Nikita Kulshreshtha
1 parent 1381a9da

setting default value of layer change textinput

removing annotation on list manager selection.
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... ... @@ -2328,6 +2328,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2328 2328 //layer change function
2329 2329 $scope.LayerChange = function () {
2330 2330  
  2331 + //remove annotation
  2332 +
  2333 +
  2334 +
  2335 +
2331 2336 $scope.isLayerChange = true;
2332 2337 $rootScope.isLoading = true;
2333 2338 $('#spinner').css('visibility', 'visible');
... ... @@ -4953,7 +4958,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4953 4958  
4954 4959 $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
4955 4960 }
4956   - else if ($scope.isHighlightByListManager == true) {
  4961 + else if ($rootScope.isListManagerSelected == true) {
4957 4962  
4958 4963 // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length);
4959 4964 $timeout(function () {
... ... @@ -6922,60 +6927,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6922 6927  
6923 6928 //8.remove current layer canavses
6924 6929 $scope.flushCanvas();
6925   - //for (var i = 1; i < 7; i++) {
6926   -
6927   - // var id;
6928   - // var maskId;
6929   -
6930   - // id = 'imageCanvas' + i;
6931   - // maskId = 'imageCanvas' + i + '_mci';
6932   -
6933   - // var canvas = document.getElementById(id);
6934   - // document.getElementById('canvasDiv').removeChild(canvas);
6935   -
6936   - // var maskcanvas = document.getElementById(maskId);
6937   - // document.getElementById('canvasDiv').removeChild(maskcanvas);
6938   -
6939   - // if (i == 4 || i == 5 || i == 6) {
6940   - // id = 'imageCanvas' + i + '_MR';
6941   - // maskId = 'imageCanvas' + i + '_MR_mci';
6942   -
6943   - // var canvas = document.getElementById(id);
6944   - // document.getElementById('canvasDiv').removeChild(canvas);
6945   -
6946   - // var maskcanvas = document.getElementById(maskId);
6947   - // document.getElementById('canvasDiv').removeChild(maskcanvas);
6948   - // }
6949   -
6950   - // //remove modesty canavs
6951   - // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
6952   - // for (var j = 0; j < modestyCanvases.length; j++) {
6953   - // modestyCanvases[j].remove();
6954   - // }
6955   - //}
  6930 +
6956 6931  
6957 6932 //9.
6958 6933 $timeout(function () {
6959 6934 $rootScope.isHighLight = false;
6960   - $scope.CalculateImageCordinates($rootScope.viewOrientationId)
6961   - }, 500);
6962 6935  
6963   - $scope.isHighlightByListManager = true;
  6936 + $('#sppeachBubble').css('display', 'none');
6964 6937  
6965   - //10.
6966   - //$timeout(function () {
6967   - // $rootScope.isHighLight = true;
6968   - // $scope.highLightBody()
6969   - //}, 500);
6970   - //$timeout(function () {
  6938 + $("#dot").css("display", "none");
6971 6939  
6972   - // // $rootScope.isHighLight = false;
6973   -
6974   - // $scope.HighlightBodyByTermList($scope.TermList)
6975   - //}, 2000);
  6940 + $scope.CalculateImageCordinates($rootScope.viewOrientationId)
  6941 + }, 500);
6976 6942  
6977   - //4.get scroll position
6978 6943  
  6944 +
6979 6945 }
6980 6946  
6981 6947 $scope.getChildTermList = function (termNo) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
... ... @@ -340,7 +340,7 @@
340 340 range: "max", // <--- needed...
341 341 min: 0,
342 342 // max: 100,
343   - //value: 0,
  343 + value: 0,
344 344 slide: function (event, ui) {
345 345 // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
346 346  
... ...