fix (app): pages didn't return to the top after changing tabs

Close#56
amolv · Dec 10, 2016 · fd17c83 · fd17c83
1 parent 29bf20b
commit fd17c83
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 8 deletions.
diff --git a/src/app/pages/charts/charts.module.js b/src/app/pages/charts/charts.module.js
@@ -19,7 +19,7 @@
         .state('charts', {
           url: '/charts',
           abstract: true,
-          template: '<div ui-view></div>',
+          template: '<div ui-view  autoscroll="true" autoscroll-body-top></div>',
           title: 'Charts',
           sidebarMeta: {
             icon: 'ion-stats-bars',

diff --git a/src/app/pages/components/components.module.js b/src/app/pages/components/components.module.js
@@ -17,7 +17,7 @@
     $stateProvider
         .state('components', {
           url: '/components',
-          template : '<ui-view></ui-view>',
+          template : '<ui-view  autoscroll="true" autoscroll-body-top></ui-view>',
           abstract: true,
           title: 'Components',
           sidebarMeta: {

diff --git a/src/app/pages/form/form.module.js b/src/app/pages/form/form.module.js
@@ -13,7 +13,7 @@
     $stateProvider
         .state('form', {
           url: '/form',
-          template : '<ui-view></ui-view>',
+          template : '<ui-view autoscroll="true" autoscroll-body-top></ui-view>',
           abstract: true,
           title: 'Form Elements',
           sidebarMeta: {

diff --git a/src/app/pages/maps/maps.html b/src/app/pages/maps/maps.html
@@ -1,7 +1,7 @@
 <div class="widgets">
 
   <div class="row">
-    <div class="col-md-12" ui-view></div>
+    <div class="col-md-12" ui-view autoscroll="true" autoscroll-body-top></div>
   </div>
 
 </div>
diff --git a/src/app/pages/tables/tables.module.js b/src/app/pages/tables/tables.module.js
@@ -13,7 +13,7 @@
     $stateProvider
         .state('tables', {
           url: '/tables',
-          template : '<ui-view></ui-view>',
+          template : '<ui-view  autoscroll="true" autoscroll-body-top></ui-view>',
           abstract: true,
           controller: 'TablesPageCtrl',
           title: 'Tables',

diff --git a/src/app/pages/ui/ui.module.js b/src/app/pages/ui/ui.module.js
@@ -25,7 +25,7 @@
     $stateProvider
         .state('ui', {
           url: '/ui',
-          template : '<ui-view></ui-view>',
+          template : '<ui-view  autoscroll="true" autoscroll-body-top></ui-view>',
           abstract: true,
           title: 'UI Features',
           sidebarMeta: {

diff --git a/src/app/theme/services/baUtil.js b/src/app/theme/services/baUtil.js
@@ -27,6 +27,11 @@
       var g = parseInt( hex.slice(3,5), 16 );
       var b = parseInt( hex.slice(5,7), 16 );
       return 'rgba(' + r + ', ' + g + ', ' + b + ', ' + alpha + ')';
+    };
+
+    this.hasAttr = function (elem, attrName) {
+      var attr = $(elem).attr(attrName);
+      return (typeof attr !== typeof undefined && attr !== false);
     }
   }
 })();
diff --git a/src/app/theme/theme.config.js b/src/app/theme/theme.config.js
@@ -9,7 +9,8 @@
     .config(config);
 
   /** @ngInject */
-  function config(baConfigProvider, colorHelper) {
+  function config(baConfigProvider, colorHelper, $provide) {
+    $provide.decorator('$uiViewScroll', uiViewScrollDecorator);
     //baConfigProvider.changeTheme({blur: true});
     //
     //baConfigProvider.changeColors({
@@ -20,4 +21,15 @@
     //  },
     //});
   }
+
+  /** @ngInject */
+  function uiViewScrollDecorator($delegate, $anchorScroll, baUtil) {
+    return function (uiViewElement) {
+      if (baUtil.hasAttr(uiViewElement, "autoscroll-body-top")) {
+        $anchorScroll();
+      } else {
+        $delegate(uiViewElement);
+      }
+    };
+  }
 })();
diff --git a/src/index.html b/src/index.html
@@ -34,7 +34,7 @@
   <div class="al-main">
     <div class="al-content">
       <content-top></content-top>
-      <div ui-view></div>
+      <div ui-view autoscroll="true" autoscroll-body-top></div>
     </div>
   </div>