From f0ef0e36cce208b3b59f378bcbe23a190b8997f1 Mon Sep 17 00:00:00 2001
From: amrita.vishnoi <amrita.vishnoi@ebix.com>
Date: Wed, 26 Jul 2017 15:46:31 +0530
Subject: [PATCH] against merge request  #584 and  #586

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js |  9 ++++++---
 400-SOURCECODE/AIAHTML5.Web/index.html                                |  2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index ceef02f..73a5216 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -1,7 +1,7 @@
 'use strict';
 
-AIA.controller("TileViewListController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService",
-function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService) {
+AIA.controller("TileViewListController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService",
+function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService) {
 
 
     $rootScope.OpenedTileData = [];
@@ -115,6 +115,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                    console.log(' error: ' + error.statusText);
                }
               )
+        if (localStorage.getItem('AAGridViewScroll') !== null) {
+            $('html, body').animate({ scrollTop: localStorage.getItem('AAGridViewScroll') }, 'slow');
+        }
     }
 
     //$scope.$on('$viewContentLoaded', function (event) {
@@ -159,7 +162,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
         //3. set opened module item ti
         localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]);
-
+        localStorage.setItem("AAGridViewScroll", $($window).scrollTop());
         //3. Navigate to the Module-item-view
         var u = $location.url();
         $location.url('/module-item-view');
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index d6906eb..6f6a657 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1893,7 +1893,7 @@
     <script>
         $(function () {
             $("#btnSaveEI").click(function () {
-                $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
+               $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
                 html2canvas($("#canvasDiv"), {
                     onrendered: function (canvas) {
                         theCanvas = canvas;
--
libgit2 0.21.4