From 0746dd80da12a1686c80dec189a337dbe960f499 Mon Sep 17 00:00:00 2001 From: nikita Date: Wed, 7 Sep 2016 18:30:59 +0530 Subject: [PATCH] after develop branch merge. it is having 7245 bug resolved. also have extarct aftyer search and list managervhighlight. IT IS HAVING ISSUE IN LIST MANAGER. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index c189fb1..19fc6a7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2433,7 +2433,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo console.log('LAYERCHANGE $scope.imageHorizontlScrollPosition = ' + $scope.imageHorizontlScrollPosition + ' and $scope.imageVerticalScrollPosition = ' + $scope.imageVerticalScrollPosition) - $scope.flushCanvas(); + $scope.counter = 0; $scope.counterFlip = 0; @@ -2529,6 +2529,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } else { + + //1. Dated:13-07-2016 Issue #4965 : The layer number should not extend beyond its level through layer text box. var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length; if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) { @@ -2548,6 +2550,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo canDiv.innerHTML = ''; } + $scope.flushCanvas(); //2. //existing data if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) && $scope.ColoredImageSRC.length > 0) { -- libgit2 0.21.4