ADAM / AIAHTML5

Commit fe4f6d78666be9b975dbc763b8b2c7fe0301238e

Authored by Amrita Vishnoi
2 parents 8af824a8 017bbdc4

Merge branch 'navigatoroutside' into Develop

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @fe4f6d7
... ... @@ -104,18 +104,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
104 104 $rootScope.NavigatorData;
105 105 $scope.navimgsrc;
106 106  
107   - $scope.dragdivleft = 21;
  107 + $scope.dragdivleft;
108 108 $scope.dragdivtop = 0;
109 109  
110 110 $rootScope.systemNumber = 0;
111 111  
112 112 $scope.IsSearchVisible = false;
113 113 $scope.shapesize = 1;
114   - $scope.dragdivposition = {
115   - "left": $scope.dragdivleft,
116   - "top": $scope.dragdivtop
117   - };
118   -
  114 +
119 115  
120 116 //array for bodyviewid correspoing to male female(used for gender change)
121 117 $scope.correspondingBodyViewIds = {
... ... @@ -1251,13 +1247,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1251 1247 };
1252 1248 }
1253 1249 }
1254   -
1255   -
  1250 +
  1251 + $scope.dragdivposition = {
  1252 + "left": $scope.dragdivleft,
  1253 + "top": $scope.dragdivtop
  1254 + };
1256 1255  
1257 1256 $('#draggable').css('width', dragdivw);
1258 1257 $('#draggable').css('height', dragdivh)
1259 1258  
1260 1259 }
  1260 +
1261 1261  
1262 1262 function scaleRectangle(x, y, height, width, mirrorValue) {
1263 1263 var nzoom = $rootScope.zoomInOut;
... ...