Commit 2e475c94383736beb78937064e279fd29347b194
Merge branch 'ListManagerIEIssue_1' into Develop
Showing
1 changed file
with
36 additions
and
0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -899,6 +899,42 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -899,6 +899,42 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 899 | $rootScope.switchCanvas(); | 899 | $rootScope.switchCanvas(); |
| 900 | } | 900 | } |
| 901 | $rootScope.shapeType = ''; | 901 | $rootScope.shapeType = ''; |
| 902 | + if ($location.url() == "/module-item-view") { | ||
| 903 | + | ||
| 904 | + var canvasZIndex = $("#canvas").css("z-index"); | ||
| 905 | + var canvasPaintZIndex = $("#canvasPaint").css("z-index"); | ||
| 906 | + | ||
| 907 | + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) { | ||
| 908 | + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1; | ||
| 909 | + $("#aaDetailViewCanvas").css("z-index", canvasPaintZIndex); | ||
| 910 | + | ||
| 911 | + } | ||
| 912 | + else { | ||
| 913 | + canvasZIndex = parseInt(canvasZIndex) + 1; | ||
| 914 | + $("#aaDetailViewCanvas").css("z-index", canvasZIndex); | ||
| 915 | + } | ||
| 916 | + for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) { | ||
| 917 | + | ||
| 918 | + for (var j = 0; j <= $rootScope.aaPinDataArray.length - 1; j++) { | ||
| 919 | + | ||
| 920 | + if (($rootScope.jcanvasObjectArray[i].x <= parseInt($rootScope.aaPinDataArray[j]._HeadX) && $rootScope.jcanvasObjectArray[i].y <= parseInt($rootScope.aaPinDataArray[j]._HeadY)) && (($rootScope.jcanvasObjectArray[i].x + $rootScope.jcanvasObjectArray[i].width) >= parseInt($rootScope.aaPinDataArray[j]._HeadX) && ($rootScope.jcanvasObjectArray[i].y + $rootScope.jcanvasObjectArray[i].height) >= parseInt($rootScope.aaPinDataArray[j]._HeadY)) || ($rootScope.jcanvasObjectArray[i].x <= parseInt($rootScope.aaPinDataArray[j]._PinX) && $rootScope.jcanvasObjectArray[i].y <= parseInt($rootScope.aaPinDataArray[j]._PinY)) && (($rootScope.jcanvasObjectArray[i].x + $rootScope.jcanvasObjectArray[i].width) >= parseInt($rootScope.aaPinDataArray[j]._PinX) && ($rootScope.jcanvasObjectArray[i].y + $rootScope.jcanvasObjectArray[i].height) >= parseInt($rootScope.aaPinDataArray[j]._PinY))) { | ||
| 921 | + | ||
| 922 | + var pinName = 'Pin_' + $rootScope.aaPinDataArray[j]._PinId; | ||
| 923 | + var pinArcName = 'PinArc_' + $rootScope.aaPinDataArray[j]._PinId; | ||
| 924 | + | ||
| 925 | + $('#aaDetailViewCanvas').setLayer(pinName, { | ||
| 926 | + visible: false // set to true instead to show the layer again | ||
| 927 | + }).drawLayers(); | ||
| 928 | + | ||
| 929 | + $('#aaDetailViewCanvas').setLayer(pinArcName, { | ||
| 930 | + visible: false // set to true instead to show the layer again | ||
| 931 | + }).drawLayers(); | ||
| 932 | + | ||
| 933 | + } | ||
| 934 | + | ||
| 935 | + } | ||
| 936 | + } | ||
| 937 | + } | ||
| 902 | } | 938 | } |
| 903 | $rootScope.CIAnotationIdentifyModeOff = false; | 939 | $rootScope.CIAnotationIdentifyModeOff = false; |
| 904 | $rootScope.OnIdentifyClick = function () { | 940 | $rootScope.OnIdentifyClick = function () { |