ADAM / AIAHTML5

Commit 730b9b8d51cf53e28c4ad554c05e5e0d9fd79a56

Authored by unknown
2 parents 4895d600 41835032

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into 22484 

Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
Inline Side-by-side
Showing 1 changed file with 5 additions and 0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @730b9b8
@@ -1228,17 +1228,21 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1228,17 +1228,21 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1228 var dragdivw = 42 1228 var dragdivw = 42
1229 $scope.dragdivleft = 21; 1229 $scope.dragdivleft = 21;
1230 $scope.dragdivtop = 0; 1230 $scope.dragdivtop = 0;
  1231 +
1231 } 1232 }
1232 else { 1233 else {
1233 var dragdivw = 83; 1234 var dragdivw = 83;
1234 1235
1235 $scope.dragdivleft = 0; 1236 $scope.dragdivleft = 0;
1236 $scope.dragdivtop = 0; 1237 $scope.dragdivtop = 0;
  1238 +
1237 } 1239 }
1238 } 1240 }
1239 $(".dragdivposition").css("left", $scope.dragdivleft); 1241 $(".dragdivposition").css("left", $scope.dragdivleft);
1240 $(".dragdivposition").css("top", $scope.dragdivtop); 1242 $(".dragdivposition").css("top", $scope.dragdivtop);
1241 1243
  1244 + $(".dragdivposition").css("left" , $scope.dragdivleft);
  1245 + $(".dragdivposition").css("top", $scope.dragdivtop);
1242 1246
1243 $('#draggable').css('width', dragdivw); 1247 $('#draggable').css('width', dragdivw);
1244 $('#draggable').css('height', dragdivh) 1248 $('#draggable').css('height', dragdivh)
@@ -2958,6 +2962,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2958,6 +2962,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2958 filppedCanvasContx.putImageData(gData, 0, 0); 2962 filppedCanvasContx.putImageData(gData, 0, 0);
2959 2963
2960 } 2964 }
  2965 + }
2961 } 2966 }
2962 2967
2963 grayImageDataVar = null; 2968 grayImageDataVar = null;