diff --git a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj index 281432f..160b365 100644 --- a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj +++ b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj @@ -73,7 +73,6 @@ - diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index a4e2dcc..27ae48e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -6961,12 +6961,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //8.remove current layer canavses $scope.flushCanvas(); + //9. $timeout(function () { $rootScope.isHighLight = false; - - //removing speechbubble $('#sppeachBubble').css('display', 'none'); $("#dot").css("display", "none"); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index a80b053..91c355f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -319,14 +319,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", } - $rootScope.backOpacity = function () { + $rootScope.enableAnnotationToolBar = function () { document.getElementById('modelbackground').style.display = "block"; $("#editshapestyle").modal('show'); } - $rootScope.closeBackOpacity = function () { + $rootScope.disableAnnotationToolBar = function () { document.getElementById('modelbackground').style.display = "none"; diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 19a16b4..28b86dd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -423,7 +423,7 @@
- ... + ...
@@ -785,7 +785,7 @@ - +