Commit 98d2f854c924244e250c31da58833c1b1d143067
1 parent
fc572b60
Year Copyright updated
Showing
2 changed files
with
15 additions
and
9 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs
... | ... | @@ -13,7 +13,10 @@ namespace AIAHTML5.API.Controllers |
13 | 13 | [HttpGet] |
14 | 14 | public HttpResponseMessage GetConfigurationvalues() |
15 | 15 | { |
16 | - int current_year = Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"]); | |
16 | + // int current_year = Int32.Parse(ConfigurationManager.AppSettings["Copyrightyear"]); | |
17 | + | |
18 | + int current_year = DateTime.Now.Year; | |
19 | + | |
17 | 20 | HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.OK, current_year); |
18 | 21 | return response; |
19 | 22 | } | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
... | ... | @@ -426,25 +426,28 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
426 | 426 | $scope.EnableUI(); |
427 | 427 | |
428 | 428 | if ($rootScope.isCallFromOtherModule) { |
429 | - $scope.JsPanelclick(windowviewid); | |
429 | + | |
430 | + $scope.JsPanelMouseEnter(windowviewid); | |
430 | 431 | $rootScope.ThreeDWindowLoadComplete = true; |
431 | 432 | } |
432 | - $scope.JsPanelclick(windowviewid); | |
433 | + | |
433 | 434 | } |
434 | 435 | |
435 | - $scope.JsPanelclick = function (windowviewid) { | |
436 | + $scope.JsPanelMouseEnter = function (windowviewid) { | |
436 | 437 | // call from while open module in CB |
437 | - $("#ThreeDImagePanel_" + windowviewid).on('click', function (event) { | |
438 | 438 | |
439 | + //click event not work on object-tag document | |
440 | + //so then add mouseenter | |
441 | + $("#ThreeDImagePanel_" + windowviewid).unbind('mouseenter');// remove prev event | |
442 | + | |
443 | + $("#ThreeDImagePanel_" + windowviewid).on('mouseenter', function (event) { | |
439 | 444 | // var pnlName = event.currentTarget.id; |
445 | + //console.log('Mouse enter fired: ' + event.currentTarget.id); | |
440 | 446 | $scope.$emit("cBEnableDisableMenuOption", ""); |
441 | - console.log('event fired') | |
442 | 447 | |
443 | 448 | }); |
444 | - | |
445 | - } | |
446 | 449 | |
447 | - | |
450 | + } | |
448 | 451 | |
449 | 452 | }]); |
450 | 453 | ... | ... |