diff --git a/src/components/appRouter.js b/src/components/appRouter.js index 8410e9bd6..17b92cfd2 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -311,21 +311,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro }); } - function enableHistory() { - - // shows status bar on navigation - if (browser.xboxOne) { - return false; - } - - // Does not support history - if (browser.orsay) { - return false; - } - - return true; - } - function enableNativeHistory() { return false; } @@ -525,9 +510,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro if (!document.querySelector('.dialogContainer') && startPages.indexOf(curr.type) !== -1) { return false; } - if (enableHistory()) { - return history.length > 1; - } + return (page.len || 0) > 0; } diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js index 4c4932702..645a8ea85 100644 --- a/src/libraries/scroller.js +++ b/src/libraries/scroller.js @@ -872,11 +872,6 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc if (item === undefined) { this.slideTo(this._pos[location], immediate); } else { - if (!transform) { - item.scrollIntoView(); - return; - } - var itemPos = this.getPos(item); if (itemPos) {