ADAM / AIAHTML5

Commit 0905fa98582cd8402d11ae434946960f70c5bed1

Authored by unknown
1 parent c6d78f13

Commit Changes

Inline Side-by-side
Showing 1 changed file with 30 additions and 24 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @0905fa9
... ... @@ -855,23 +855,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
855 855  
856 856 if ($location.url() == "/module-item-view") {
857 857  
858   - var a = $("#canvas").css("z-index");
859   - var b = $("#canvasPaint").css("z-index");
  858 + var canvasZIndex = $("#canvas").css("z-index");
  859 + var canvasPaintZIndex = $("#canvasPaint").css("z-index");
860 860  
861   - if (parseInt(a) < parseInt(b)) {
862   - b = parseInt(b) + 1;
863   - $("#aaDetailViewCanvas").css("z-index", b);
  861 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  862 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  863 + $("#aaDetailViewCanvas").css("z-index", canvasPaintZIndex);
864 864  
865 865 }
866 866 else
867 867 {
868   - a = parseInt(a) + 1;
869   - $("#aaDetailViewCanvas").css("z-index", a);
  868 + canvasZIndex = parseInt(canvasZIndex) + 1;
  869 + $("#aaDetailViewCanvas").css("z-index", canvasZIndex);
870 870 }
871 871  
872 872 }
873   -
874   -
875 873 }
876 874  
877 875 $rootScope.CloseAnnotationTool = function () {
... ... @@ -929,17 +927,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
929 927 }
930 928 if ($location.url() == "/module-item-view") {
931 929  
932   - var a = $("#canvas").css("z-index");
933   - var b = $("#canvasPaint").css("z-index");
  930 + var canvasZIndex = $("#canvas").css("z-index");
  931 + var canvasPaintZIndex = $("#canvasPaint").css("z-index");
934 932  
935   - if (parseInt(a) < parseInt(b)) {
936   - b = parseInt(b) + 1;
937   - $("#aaDetailViewCanvas").css("z-index", b);
  933 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  934 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  935 + $("#aaDetailViewCanvas").css("z-index", canvasPaintZIndex);
938 936  
939 937 }
940 938 else {
941   - a = parseInt(a) + 1;
942   - $("#aaDetailViewCanvas").css("z-index", a);
  939 + canvasZIndex = parseInt(canvasZIndex) + 1;
  940 + $("#aaDetailViewCanvas").css("z-index", canvasZIndex);
943 941 }
944 942 for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {
945 943  
... ... @@ -1128,15 +1126,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1128 1126 }
1129 1127  
1130 1128 $rootScope.switchToAACanvas = function () {
1131   - var a = $("#aaDetailViewCanvas").css("z-index");
1132   - var b = $("#canvasPaint").css("z-index");
1133   - if (parseInt(a) < parseInt(b)) {
1134   - b = parseInt(b) + 1;
1135   - $("#canvas").css("z-index", b);
  1129 + var aaViewCanvasZIndex = $("#aaDetailViewCanvas").css("z-index");
  1130 + var canvasPaintZIndex = $("#canvasPaint").css("z-index");
  1131 + if (parseInt(aaViewCanvasZIndex) < parseInt(canvasPaintZIndex)) {
  1132 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  1133 + $("#canvas").css("z-index", canvasPaintZIndex);
1136 1134 }
1137 1135 else {
1138   - a = parseInt(a) + 1;
1139   - $("#canvas").css("z-index", a);
  1136 + aaViewCanvasZIndex = parseInt(aaViewCanvasZIndex) + 1;
  1137 + $("#canvas").css("z-index", aaViewCanvasZIndex);
1140 1138 }
1141 1139 }
1142 1140  
... ... @@ -1948,8 +1946,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1948 1946 //added abs
1949 1947 width: Math.abs(x - offsetX1), height: Math.abs(y - offsetY1),
1950 1948 // Place a handle at each side and each corner
1951   - resizeFromCenter: false,
  1949 + resizeFromCenter: true,
1952 1950 handlePlacement: 'both',
  1951 + cursors: {
  1952 + // Show pointer on hover
  1953 + mouseover: 'pointer',
  1954 + // Show 'move' cursor on mousedown
  1955 + mousedown: 'move',
  1956 + // Revert cursor on mouseup
  1957 + mouseup: 'pointer'
  1958 + },
1953 1959 add: function (layer) {
1954 1960  
1955 1961 if ($location.path() == "/module-item-view") {
... ...