From 4b280fff78f1fea104d6c38771eef456c1a1421e Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 21 Feb 2017 18:14:17 +0530 Subject: [PATCH] annotation tool bar canavses was added before deletion of the canvasDiv child. changed the location. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 1b20c90..e547bb0 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -854,15 +854,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.modestyImageInfo = []; // annotation toolbar canvas - //history code - - if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) { - var ATBarHtml = $("#canvasDiv").append(''); - $compile(ATBarHtml)($scope); - $scope.onDrawingCanvasClick(); - // $rootScope.FreeStylePaint(); - - } + $scope.terminateCurrentlyRunningWPs(); @@ -927,6 +919,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.ColoredImageSRC = []; } + //history code + + if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) { + var ATBarHtml = $("#canvasDiv").append(''); + $compile(ATBarHtml)($scope); + $scope.onDrawingCanvasClick(); + // $rootScope.FreeStylePaint(); + + } + if ($scope.bodyRegionCoordinates != null || $scope.bodyRegionCoordinates != undefined) { angular.forEach($scope.bodyRegionCoordinates, function (value, key) { -- libgit2 0.21.4