diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs index 7199fc0..892bbab 100644 --- a/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs +++ b/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs @@ -13,7 +13,10 @@ namespace AIAHTML5.API.Controllers [HttpGet] public HttpResponseMessage GetConfigurationvalues() { - int current_year = Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"]); + // int current_year = Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"]); + + int current_year = DateTime.Now.Year; + HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.OK, current_year); return response; } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 4d10648..940a1a6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -426,25 +426,28 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.EnableUI(); if ($rootScope.isCallFromOtherModule) { - $scope.JsPanelclick(windowviewid); + + $scope.JsPanelMouseEnter(windowviewid); $rootScope.ThreeDWindowLoadComplete = true; } - $scope.JsPanelclick(windowviewid); + } - $scope.JsPanelclick = function (windowviewid) { + $scope.JsPanelMouseEnter = function (windowviewid) { // call from while open module in CB - $("#ThreeDImagePanel_" + windowviewid).on('click', function (event) { + //click event not work on object-tag document + //so then add mouseenter + $("#ThreeDImagePanel_" + windowviewid).unbind('mouseenter');// remove prev event + + $("#ThreeDImagePanel_" + windowviewid).on('mouseenter', function (event) { // var pnlName = event.currentTarget.id; + //console.log('Mouse enter fired: ' + event.currentTarget.id); $scope.$emit("cBEnableDisableMenuOption", ""); - console.log('event fired') }); - - } - + } }]);