diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 67d2287..a538c79 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2448,6 +2448,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $timeout(function () { $scope.DisableProgressBar() }, 1000); + }; @@ -2710,6 +2711,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2); + }; worker.onerror = function (e) { @@ -5983,7 +5986,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } $scope.enableZoom = function () { - + $(".annotationTollbar").css("display", "none"); + $("#annotationButton").removeClass("active"); $("#btnExtract").removeClass("disabled"); $("#btnTranparency").removeClass("disabled"); $rootScope.isTransparencyBoxActivated = false; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 0401f4d..d8cc549 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -1,7 +1,7 @@ 'use strict'; AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants", -function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, AdminConstants, UserTypeConstants, $http) { +function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants) { //$scope.pageToOpen = { // name: 'MainMenu' @@ -565,6 +565,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $('#daImagePanel').remove(); if ($('#jsPanel-1').length > 0) $('#jsPanel-1').remove(); + + if ($('#3DImagePanel').length > 0) + $('#3DImagePanel').remove(); + + if ($('#ciImagePanel').length > 0) + $('#ciImagePanel').remove(); + + if ($('#caVideoPanel').length > 0) + $('#caVideoPanel').remove(); + $location.url('/' + slug); $rootScope.$broadcast('jsPanelCloseEvent', true); diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 1e1550f..baf48fd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1046,7 +1046,7 @@ @@ -1216,10 +1216,10 @@ -