Commit 41835032c3d9f9119faea0680941a8812b145f52
Merge branch 'dragdivposition' of http://52.6.196.163/ADAM/AIAHTML5 into DevStable30Aug17
Showing
2 changed files
with
5 additions
and
14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -1229,10 +1229,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -1229,10 +1229,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 1229 | $scope.dragdivleft = 21; | 1229 | $scope.dragdivleft = 21; |
| 1230 | $scope.dragdivtop = 0; | 1230 | $scope.dragdivtop = 0; |
| 1231 | 1231 | ||
| 1232 | - $scope.dragdivposition = { | ||
| 1233 | - "left": 21, | ||
| 1234 | - "top": 0 | ||
| 1235 | - }; | 1232 | + |
| 1236 | } | 1233 | } |
| 1237 | else { | 1234 | else { |
| 1238 | var dragdivw = 83; | 1235 | var dragdivw = 83; |
| @@ -1240,18 +1237,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -1240,18 +1237,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 1240 | $scope.dragdivleft = 0; | 1237 | $scope.dragdivleft = 0; |
| 1241 | $scope.dragdivtop = 0; | 1238 | $scope.dragdivtop = 0; |
| 1242 | 1239 | ||
| 1243 | - $scope.dragdivposition = { | ||
| 1244 | - "left": 0, | ||
| 1245 | - "top": 0 | ||
| 1246 | - | ||
| 1247 | - }; | 1240 | + |
| 1248 | } | 1241 | } |
| 1249 | } | 1242 | } |
| 1250 | 1243 | ||
| 1251 | - $scope.dragdivposition = { | ||
| 1252 | - "left": $scope.dragdivleft, | ||
| 1253 | - "top": $scope.dragdivtop | ||
| 1254 | - }; | 1244 | + $(".dragdivposition").css("left" , $scope.dragdivleft); |
| 1245 | + $(".dragdivposition").css("top", $scope.dragdivtop); | ||
| 1255 | 1246 | ||
| 1256 | $('#draggable').css('width', dragdivw); | 1247 | $('#draggable').css('width', dragdivw); |
| 1257 | $('#draggable').css('height', dragdivh) | 1248 | $('#draggable').css('height', dragdivh) |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
| @@ -292,7 +292,7 @@ | @@ -292,7 +292,7 @@ | ||
| 292 | <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; "> | 292 | <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; "> |
| 293 | <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; "> | 293 | <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; "> |
| 294 | <img id="navimg" alt=""/> | 294 | <img id="navimg" alt=""/> |
| 295 | - <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition"> | 295 | + <div id="draggable" class="draggable ui-widget-content dragdivposition" ng-mouseup="ScrollCanvasDiv()" > |
| 296 | </div> | 296 | </div> |
| 297 | </div> | 297 | </div> |
| 298 | 298 |