ADAM / AIAHTML5

Commit f0ef0e36cce208b3b59f378bcbe23a190b8997f1

Authored by Amrita Vishnoi
1 parent ecee813c

against merge request #584 and #586

Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @f0ef0e3
1 1 'use strict';
2 2  
3   -AIA.controller("TileViewListController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService",
4   -function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService) {
  3 +AIA.controller("TileViewListController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService",
  4 +function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService) {
5 5  
6 6  
7 7 $rootScope.OpenedTileData = [];
... ... @@ -115,6 +115,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
115 115 console.log(' error: ' + error.statusText);
116 116 }
117 117 )
  118 + if (localStorage.getItem('AAGridViewScroll') !== null) {
  119 + $('html, body').animate({ scrollTop: localStorage.getItem('AAGridViewScroll') }, 'slow');
  120 + }
118 121 }
119 122  
120 123 //$scope.$on('$viewContentLoaded', function (event) {
... ... @@ -159,7 +162,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
159 162 $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
160 163 //3. set opened module item ti
161 164 localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]);
162   -
  165 + localStorage.setItem("AAGridViewScroll", $($window).scrollTop());
163 166 //3. Navigate to the Module-item-view
164 167 var u = $location.url();
165 168 $location.url('/module-item-view');
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @f0ef0e3
... ... @@ -1893,7 +1893,7 @@
1893 1893 <script>
1894 1894 $(function () {
1895 1895 $("#btnSaveEI").click(function () {
1896   - $("#canvasDiv").append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
  1896 + $("#canvasDiv").append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
1897 1897 html2canvas($("#canvasDiv"), {
1898 1898 onrendered: function (canvas) {
1899 1899 theCanvas = canvas;
... ...