framework7 6.3.4 → 7.0.0-beta.3

package/{esm/modules → modules}/router/navigate.js

@@ -1,5 +1,3 @@
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 import { getDocument } from 'ssr-window';
 import $ from '../../shared/dom7';
 import { extend, parseUrlQuery } from '../../shared/utils';
@@ -10,7 +8,7 @@ import appRouterCheck from './app-router-check';
 import asyncComponent from './async-component';
 
 function refreshPage() {
-  var router = this;
+  const router = this;
   appRouterCheck(router, 'refreshPage');
   return router.navigate(router.currentRoute.url, {
     ignoreCache: true,
@@ -18,16 +16,12 @@ function refreshPage() {
   });
 }
 
-function forward(router, el, forwardOptions) {
-  if (forwardOptions === void 0) {
-    forwardOptions = {};
-  }
-
-  var document = getDocument();
-  var $el = $(el);
-  var app = router.app;
-  var view = router.view;
-  var options = extend(false, {
+function forward(router, el, forwardOptions = {}) {
+  const document = getDocument();
+  const $el = $(el);
+  const app = router.app;
+  const view = router.view;
+  const options = extend(false, {
     animate: router.params.animate,
     browserHistory: true,
     replaceState: false,
@@ -39,16 +33,16 @@ function forward(router, el, forwardOptions) {
     reloadDetail: router.params.reloadDetail,
     on: {}
   }, forwardOptions);
-  var masterDetailEnabled = router.params.masterDetailBreakpoint > 0;
-  var isMaster = masterDetailEnabled && options.route && options.route.route && (options.route.route.master === true || typeof options.route.route.master === 'function' && options.route.route.master(app, router));
-  var masterPageEl;
-  var otherDetailPageEl;
-  var detailsInBetweenRemoved = 0;
-  var currentRouteIsModal = router.currentRoute.modal;
-  var modalType;
+  const masterDetailEnabled = router.params.masterDetailBreakpoint > 0;
+  const isMaster = masterDetailEnabled && options.route && options.route.route && (options.route.route.master === true || typeof options.route.route.master === 'function' && options.route.route.master(app, router));
+  let masterPageEl;
+  let otherDetailPageEl;
+  let detailsInBetweenRemoved = 0;
+  let currentRouteIsModal = router.currentRoute.modal;
+  let modalType;
 
   if (!currentRouteIsModal) {
-    'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(function (modalLoadProp) {
+    'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(modalLoadProp => {
       if (router.currentRoute && router.currentRoute.route && router.currentRoute.route[modalLoadProp]) {
         currentRouteIsModal = true;
         modalType = modalLoadProp;
@@ -57,9 +51,9 @@ function forward(router, el, forwardOptions) {
   }
 
   if (currentRouteIsModal) {
-    var modalToClose = router.currentRoute.modal || router.currentRoute.route.modalInstance || app[modalType].get();
-    var previousUrl = router.history[router.history.length - 2];
-    var previousRoute = router.findMatchingRoute(previousUrl);
+    const modalToClose = router.currentRoute.modal || router.currentRoute.route.modalInstance || app[modalType].get();
+    const previousUrl = router.history[router.history.length - 2];
+    let previousRoute = router.findMatchingRoute(previousUrl);
 
     if (!previousRoute && previousUrl) {
       previousRoute = {
@@ -76,14 +70,14 @@ function forward(router, el, forwardOptions) {
     router.modalRemove(modalToClose);
   }
 
-  var dynamicNavbar = router.dynamicNavbar;
-  var $viewEl = router.$el;
-  var $newPage = $el;
-  var reload = options.reloadPrevious || options.reloadCurrent || options.reloadAll;
-  var $oldPage;
-  var $navbarsEl;
-  var $newNavbarEl;
-  var $oldNavbarEl;
+  const dynamicNavbar = router.dynamicNavbar;
+  const $viewEl = router.$el;
+  const $newPage = $el;
+  const reload = options.reloadPrevious || options.reloadCurrent || options.reloadAll;
+  let $oldPage;
+  let $navbarsEl;
+  let $newNavbarEl;
+  let $oldNavbarEl;
   router.allowPageChange = false;
 
   if ($newPage.length === 0) {
@@ -114,16 +108,12 @@ function forward(router, el, forwardOptions) {
   } // Pages In View
 
 
-  var $pagesInView = $viewEl.children('.page:not(.stacked)').filter(function (pageInView) {
-    return pageInView !== $newPage[0];
-  }); // Navbars In View
+  const $pagesInView = $viewEl.children('.page:not(.stacked)').filter(pageInView => pageInView !== $newPage[0]); // Navbars In View
 
-  var $navbarsInView;
+  let $navbarsInView;
 
   if (dynamicNavbar) {
-    $navbarsInView = $navbarsEl.children('.navbar:not(.stacked)').filter(function (navbarInView) {
-      return navbarInView !== $newNavbarEl[0];
-    });
+    $navbarsInView = $navbarsEl.children('.navbar:not(.stacked)').filter(navbarInView => navbarInView !== $newNavbarEl[0]);
   } // Exit when reload previous and only 1 page in view so nothing ro reload
 
 
@@ -133,12 +123,12 @@ function forward(router, el, forwardOptions) {
   } // Find Detail' master page
 
 
-  var isDetail;
-  var reloadDetail;
-  var isDetailRoot;
+  let isDetail;
+  let reloadDetail;
+  let isDetailRoot;
 
   if (masterDetailEnabled && !options.reloadAll) {
-    for (var i = 0; i < $pagesInView.length; i += 1) {
+    for (let i = 0; i < $pagesInView.length; i += 1) {
       if (!masterPageEl && $pagesInView[i].classList.contains('page-master')) {
         masterPageEl = $pagesInView[i];
         continue; // eslint-disable-line
@@ -150,9 +140,9 @@ function forward(router, el, forwardOptions) {
     if (isDetail) {
       // Find Other Detail
       if (masterPageEl) {
-        for (var _i = 0; _i < $pagesInView.length; _i += 1) {
-          if ($pagesInView[_i].classList.contains('page-master-detail')) {
-            otherDetailPageEl = $pagesInView[_i];
+        for (let i = 0; i < $pagesInView.length; i += 1) {
+          if ($pagesInView[i].classList.contains('page-master-detail')) {
+            otherDetailPageEl = $pagesInView[i];
             continue; // eslint-disable-line
           }
         }
@@ -167,7 +157,7 @@ function forward(router, el, forwardOptions) {
   } // New Page
 
 
-  var newPagePosition = 'next';
+  let newPagePosition = 'next';
 
   if (options.reloadCurrent || options.reloadAll || reloadDetail) {
     newPagePosition = 'current';
@@ -175,7 +165,7 @@ function forward(router, el, forwardOptions) {
     newPagePosition = 'previous';
   }
 
-  $newPage.removeClass('page-previous page-current page-next').addClass("page-" + newPagePosition + (isMaster ? ' page-master' : '') + (isDetail ? ' page-master-detail' : '') + (isDetailRoot ? ' page-master-detail-root' : '')).removeClass('stacked').trigger('page:unstack').trigger('page:position', {
+  $newPage.removeClass('page-previous page-current page-next').addClass(`page-${newPagePosition}${isMaster ? ' page-master' : ''}${isDetail ? ' page-master-detail' : ''}${isDetailRoot ? ' page-master-detail-root' : ''}`).removeClass('stacked').trigger('page:unstack').trigger('page:position', {
     position: newPagePosition
   });
   router.emit('pageUnstack', $newPage[0]);
@@ -193,7 +183,7 @@ function forward(router, el, forwardOptions) {
   }
 
   if (dynamicNavbar && $newNavbarEl.length) {
-    $newNavbarEl.removeClass('navbar-previous navbar-current navbar-next').addClass("navbar-" + newPagePosition + (isMaster ? ' navbar-master' : '') + (isDetail ? ' navbar-master-detail' : '') + (isDetailRoot ? ' navbar-master-detail-root' : '')).removeClass('stacked');
+    $newNavbarEl.removeClass('navbar-previous navbar-current navbar-next').addClass(`navbar-${newPagePosition}${isMaster ? ' navbar-master' : ''}${isDetail ? ' navbar-master-detail' : ''}${isDetailRoot ? ' navbar-master-detail-root' : ''}`).removeClass('stacked');
     $newNavbarEl.trigger('navbar:position', {
       position: newPagePosition
     });
@@ -210,14 +200,10 @@ function forward(router, el, forwardOptions) {
 
   if (options.reloadCurrent || reloadDetail) {
     if (reloadDetail) {
-      $oldPage = $pagesInView.filter(function (pageEl) {
-        return !pageEl.classList.contains('page-master');
-      });
+      $oldPage = $pagesInView.filter(pageEl => !pageEl.classList.contains('page-master'));
 
       if (dynamicNavbar) {
-        $oldNavbarEl = $($oldPage.map(function (pageEl) {
-          return app.navbar.getElByPage(pageEl);
-        }));
+        $oldNavbarEl = $($oldPage.map(pageEl => app.navbar.getElByPage(pageEl)));
       }
 
       if ($oldPage.length > 1 && masterPageEl) {
@@ -245,27 +231,23 @@ function forward(router, el, forwardOptions) {
       $oldNavbarEl = $(app.navbar.getElByPage($oldPage));
     }
   } else if (options.reloadAll) {
-    $oldPage = $pagesInView.filter(function (pageEl) {
-      return pageEl !== $newPage[0];
-    });
+    $oldPage = $pagesInView.filter(pageEl => pageEl !== $newPage[0]);
 
     if (dynamicNavbar) {
-      $oldNavbarEl = $navbarsInView.filter(function (navbarEl) {
-        return navbarEl !== $newNavbarEl[0];
-      });
+      $oldNavbarEl = $navbarsInView.filter(navbarEl => navbarEl !== $newNavbarEl[0]);
     }
   } else {
-    var removedPageEls = [];
-    var removedNavbarEls = [];
+    let removedPageEls = [];
+    let removedNavbarEls = [];
 
     if ($pagesInView.length > 1) {
-      var _i2 = 0;
+      let i = 0;
 
-      for (_i2 = 0; _i2 < $pagesInView.length - 1; _i2 += 1) {
-        if (masterPageEl && $pagesInView[_i2] === masterPageEl) {
-          $pagesInView.eq(_i2).addClass('page-master-stacked');
-          $pagesInView.eq(_i2).trigger('page:masterstack');
-          router.emit('pageMasterStack', $pagesInView[_i2]);
+      for (i = 0; i < $pagesInView.length - 1; i += 1) {
+        if (masterPageEl && $pagesInView[i] === masterPageEl) {
+          $pagesInView.eq(i).addClass('page-master-stacked');
+          $pagesInView.eq(i).trigger('page:masterstack');
+          router.emit('pageMasterStack', $pagesInView[i]);
 
           if (dynamicNavbar) {
             $(app.navbar.getElByPage(masterPageEl)).addClass('navbar-master-stacked');
@@ -275,21 +257,21 @@ function forward(router, el, forwardOptions) {
           continue; // eslint-disable-line
         }
 
-        var oldNavbarEl = app.navbar.getElByPage($pagesInView.eq(_i2));
+        const oldNavbarEl = app.navbar.getElByPage($pagesInView.eq(i));
 
         if (router.params.stackPages) {
-          $pagesInView.eq(_i2).addClass('stacked');
-          $pagesInView.eq(_i2).trigger('page:stack');
-          router.emit('pageStack', $pagesInView[_i2]);
+          $pagesInView.eq(i).addClass('stacked');
+          $pagesInView.eq(i).trigger('page:stack');
+          router.emit('pageStack', $pagesInView[i]);
 
           if (dynamicNavbar) {
             $(oldNavbarEl).addClass('stacked');
           }
         } else {
           // Page remove event
-          removedPageEls.push($pagesInView[_i2]);
-          router.pageCallback('beforeRemove', $pagesInView[_i2], $navbarsInView && $navbarsInView[_i2], 'previous', undefined, options);
-          router.removePage($pagesInView[_i2]);
+          removedPageEls.push($pagesInView[i]);
+          router.pageCallback('beforeRemove', $pagesInView[i], $navbarsInView && $navbarsInView[i], 'previous', undefined, options);
+          router.removePage($pagesInView[i]);
 
           if (dynamicNavbar && oldNavbarEl) {
             removedNavbarEls.push(oldNavbarEl);
@@ -299,14 +281,10 @@ function forward(router, el, forwardOptions) {
       }
     }
 
-    $oldPage = $viewEl.children('.page:not(.stacked)').filter(function (pageEl) {
-      return pageEl !== $newPage[0] && removedPageEls.indexOf(pageEl) < 0;
-    });
+    $oldPage = $viewEl.children('.page:not(.stacked)').filter(pageEl => pageEl !== $newPage[0] && removedPageEls.indexOf(pageEl) < 0);
 
     if (dynamicNavbar) {
-      $oldNavbarEl = $navbarsEl.children('.navbar:not(.stacked)').filter(function (navbarEl) {
-        return navbarEl !== $newNavbarEl[0] && removedNavbarEls.indexOf(removedNavbarEls) < 0;
-      });
+      $oldNavbarEl = $navbarsEl.children('.navbar:not(.stacked)').filter(navbarEl => navbarEl !== $newNavbarEl[0] && removedNavbarEls.indexOf(removedNavbarEls) < 0);
     }
 
     removedPageEls = [];
@@ -315,21 +293,17 @@ function forward(router, el, forwardOptions) {
 
   if (isDetail && !options.reloadAll) {
     if ($oldPage.length > 1 || reloadDetail) {
-      $oldPage = $oldPage.filter(function (pageEl) {
-        return !pageEl.classList.contains('page-master');
-      });
+      $oldPage = $oldPage.filter(pageEl => !pageEl.classList.contains('page-master'));
     }
 
     if ($oldNavbarEl && ($oldNavbarEl.length > 1 || reloadDetail)) {
-      $oldNavbarEl = $oldNavbarEl.filter(function (navbarEl) {
-        return !navbarEl.classList.contains('navbar-master');
-      });
+      $oldNavbarEl = $oldNavbarEl.filter(navbarEl => !navbarEl.classList.contains('navbar-master'));
     }
   } // Push State
 
 
   if (router.params.browserHistory && (options.browserHistory || options.replaceState) && !options.reloadPrevious) {
-    var browserHistoryRoot = router.params.browserHistoryRoot || '';
+    const browserHistoryRoot = router.params.browserHistoryRoot || '';
     History[options.reloadCurrent || reloadDetail && otherDetailPageEl || options.reloadAll || options.replaceState ? 'replace' : 'push'](view.id, {
       url: options.route.url
     }, browserHistoryRoot + router.params.browserHistorySeparator + options.route.url);
@@ -350,7 +324,7 @@ function forward(router, el, forwardOptions) {
   } // Update router history
 
 
-  var url = options.route.url;
+  const url = options.route.url;
 
   if (options.history) {
     if (((options.reloadCurrent || reloadDetail && otherDetailPageEl) && router.history.length) > 0 || options.replaceState) {
@@ -370,12 +344,12 @@ function forward(router, el, forwardOptions) {
 
   router.saveHistory(); // Insert new page and navbar
 
-  var newPageInDom = $newPage.parents(document).length > 0;
-  var f7Component = $newPage[0].f7Component;
+  const newPageInDom = $newPage.parents(document).length > 0;
+  const f7Component = $newPage[0].f7Component;
 
   if (options.reloadPrevious) {
     if (f7Component && !newPageInDom) {
-      f7Component.mount(function (componentEl) {
+      f7Component.mount(componentEl => {
         $(componentEl).insertBefore($oldPage);
       });
     } else {
@@ -400,7 +374,7 @@ function forward(router, el, forwardOptions) {
   } else {
     if ($oldPage.next('.page')[0] !== $newPage[0]) {
       if (f7Component && !newPageInDom) {
-        f7Component.mount(function (componentEl) {
+        f7Component.mount(componentEl => {
           $viewEl.append(componentEl);
         });
       } else {
@@ -450,9 +424,9 @@ function forward(router, el, forwardOptions) {
       }
     }
   } else if (options.reloadAll) {
-    $oldPage.each(function (pageEl, index) {
-      var $oldPageEl = $(pageEl);
-      var $oldNavbarElEl = $(app.navbar.getElByPage($oldPageEl));
+    $oldPage.each((pageEl, index) => {
+      const $oldPageEl = $(pageEl);
+      const $oldNavbarElEl = $(app.navbar.getElByPage($oldPageEl));
 
       if (router.params.stackPages && router.initialPages.indexOf($oldPageEl[0]) >= 0) {
         $oldPageEl.addClass('stacked');
@@ -558,7 +532,7 @@ function forward(router, el, forwardOptions) {
     router.allowPageChange = true;
     router.pageCallback('afterOut', $oldPage, $oldNavbarEl, 'current', 'previous', options);
     router.pageCallback('afterIn', $newPage, $newNavbarEl, 'next', 'current', options);
-    var keepOldPage = (router.params.preloadPreviousPage || router.params[app.theme + "SwipeBack"]) && !isMaster;
+    let keepOldPage = (router.params.preloadPreviousPage || router.params[`${app.theme}SwipeBack`]) && !isMaster;
 
     if (!keepOldPage) {
       if ($newPage.hasClass('smart-select-page') || $newPage.hasClass('photo-browser-page') || $newPage.hasClass('autocomplete-page') || $newPage.hasClass('color-picker-page')) {
@@ -605,8 +579,8 @@ function forward(router, el, forwardOptions) {
   }
 
   if (options.animate && !(isMaster && app.width >= router.params.masterDetailBreakpoint)) {
-    var delay = router.params[router.app.theme + "PageLoadDelay"];
-    var transition = router.params.transition;
+    const delay = router.params[`${router.app.theme}PageLoadDelay`];
+    let transition = router.params.transition;
     if (options.transition) transition = options.transition;
 
     if (!transition && router.currentRoute && router.currentRoute.route) {
@@ -622,15 +596,15 @@ function forward(router, el, forwardOptions) {
     }
 
     if (delay) {
-      setTimeout(function () {
+      setTimeout(() => {
         setPositionClasses();
-        router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'forward', transition, function () {
+        router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'forward', transition, () => {
           afterAnimation();
         });
       }, delay);
     } else {
       setPositionClasses();
-      router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'forward', transition, function () {
+      router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'forward', transition, () => {
         afterAnimation();
       });
     }
@@ -641,24 +615,18 @@ function forward(router, el, forwardOptions) {
   return router;
 }
 
-function load(router, loadParams, loadOptions, ignorePageChange) {
-  if (loadParams === void 0) {
-    loadParams = {};
-  }
-
-  if (loadOptions === void 0) {
-    loadOptions = {};
-  }
-
+function load(router, loadParams = {}, loadOptions = {}, ignorePageChange) {
   if (!router.allowPageChange && !ignorePageChange) return router;
-  var params = loadParams;
-  var options = loadOptions;
-  var url = params.url,
-      content = params.content,
-      el = params.el,
-      pageName = params.pageName,
-      component = params.component,
-      componentUrl = params.componentUrl;
+  const params = loadParams;
+  const options = loadOptions;
+  const {
+    url,
+    content,
+    el,
+    pageName,
+    component,
+    componentUrl
+  } = params;
 
   if (!options.reloadCurrent && options.route && options.route.route && options.route.route.parentPath && router.currentRoute.route && router.currentRoute.route.parentPath === options.route.route.parentPath) {
     // Do something nested
@@ -668,11 +636,11 @@ function load(router, loadParams, loadOptions, ignorePageChange) {
     } // Check for same params
 
 
-    var sameParams = Object.keys(options.route.params).length === Object.keys(router.currentRoute.params).length;
+    let sameParams = Object.keys(options.route.params).length === Object.keys(router.currentRoute.params).length;
 
     if (sameParams) {
       // Check for equal params name
-      Object.keys(options.route.params).forEach(function (paramName) {
+      Object.keys(options.route.params).forEach(paramName => {
         if (!(paramName in router.currentRoute.params) || router.currentRoute.params[paramName] !== options.route.params[paramName]) {
           sameParams = false;
         }
@@ -701,7 +669,7 @@ function load(router, loadParams, loadOptions, ignorePageChange) {
     options.route = router.parseRouteUrl(url);
     extend(options.route, {
       route: {
-        url: url,
+        url,
         path: url
       }
     });
@@ -729,17 +697,17 @@ function load(router, loadParams, loadOptions, ignorePageChange) {
     forward(router, router.getPageEl(el), options);
   } else if (pageName) {
     // Load page by page name in pages container
-    forward(router, router.$el.children(".page[data-name=\"" + pageName + "\"]").eq(0), options);
+    forward(router, router.$el.children(`.page[data-name="${pageName}"]`).eq(0), options);
   } else if (component || componentUrl) {
     // Load from component (F7/Vue/React/...)
     try {
       router.pageComponentLoader({
         routerEl: router.el,
-        component: component,
-        componentUrl: componentUrl,
-        options: options,
-        resolve: resolve,
-        reject: reject
+        component,
+        componentUrl,
+        options,
+        resolve,
+        reject
       });
     } catch (err) {
       router.allowPageChange = true;
@@ -752,9 +720,9 @@ function load(router, loadParams, loadOptions, ignorePageChange) {
       router.xhrAbortController = false;
     }
 
-    router.xhrRequest(url, options).then(function (pageContent) {
+    router.xhrRequest(url, options).then(pageContent => {
       forward(router, router.getPageEl(pageContent), options);
-    }).catch(function () {
+    }).catch(() => {
       router.allowPageChange = true;
     });
   }
@@ -762,66 +730,16 @@ function load(router, loadParams, loadOptions, ignorePageChange) {
   return router;
 }
 
-function openIn(router, url, options) {
-  var navigateOptions = {
-    url: url,
-    route: {
-      path: url,
-      options: _extends({}, options, {
-        openIn: undefined
-      })
-    }
-  };
-
-  var params = _extends({}, options);
-
-  if (options.openIn === 'popup') {
-    params.content = "<div class=\"popup popup-router-open-in\" data-url=\"" + url + "\"><div class=\"view view-init\" data-links-view=\"" + router.view.selector + "\" data-url=\"" + url + "\" data-ignore-open-in=\"true\"></div></div>";
-    navigateOptions.route.popup = params;
-  }
-
-  if (options.openIn === 'loginScreen') {
-    params.content = "<div class=\"login-screen login-screen-router-open-in\" data-url=\"" + url + "\"><div class=\"view view-init\" data-links-view=\"" + router.view.selector + "\" data-url=\"" + url + "\" data-ignore-open-in=\"true\"></div></div>";
-    navigateOptions.route.loginScreen = params;
-  }
-
-  if (options.openIn === 'sheet') {
-    params.content = "<div class=\"sheet-modal sheet-modal-router-open-in\" data-url=\"" + url + "\"><div class=\"sheet-modal-inner\"><div class=\"view view-init\" data-links-view=\"" + router.view.selector + "\" data-url=\"" + url + "\" data-ignore-open-in=\"true\"></div></div></div>";
-    navigateOptions.route.sheet = params;
-  }
-
-  if (options.openIn === 'popover') {
-    params.targetEl = options.clickedEl || options.targetEl;
-    params.content = "<div class=\"popover popover-router-open-in\" data-url=\"" + url + "\"><div class=\"popover-inner\"><div class=\"view view-init\" data-links-view=\"" + router.view.selector + "\" data-url=\"" + url + "\" data-ignore-open-in=\"true\"></div></div></div>";
-    navigateOptions.route.popover = params;
-  }
-
-  if (options.openIn.indexOf('panel') >= 0) {
-    var parts = options.openIn.split(':');
-    var side = parts[1] || 'left';
-    var effect = parts[2] || 'cover';
-    params.targetEl = options.clickedEl || options.targetEl;
-    params.content = "<div class=\"panel panel-router-open-in panel-" + side + " panel-" + effect + "\" data-url=\"" + url + "\"><div class=\"view view-init\" data-links-view=\"" + router.view.selector + "\" data-url=\"" + url + "\" data-ignore-open-in=\"true\"></div></div>";
-    navigateOptions.route.panel = params;
-  }
-
-  return router.navigate(navigateOptions);
-}
-
-function navigate(navigateParams, navigateOptions) {
-  if (navigateOptions === void 0) {
-    navigateOptions = {};
-  }
-
-  var router = this;
+function navigate(navigateParams, navigateOptions = {}) {
+  const router = this;
   if (router.swipeBackActive) return router;
-  var url;
-  var createRoute;
-  var name;
-  var path;
-  var query;
-  var params;
-  var route;
+  let url;
+  let createRoute;
+  let name;
+  let path;
+  let query;
+  let params;
+  let route;
 
   if (typeof navigateParams === 'string') {
     url = navigateParams;
@@ -836,10 +754,10 @@ function navigate(navigateParams, navigateOptions) {
 
   if (name || path) {
     url = router.generateUrl({
-      path: path,
-      name: name,
-      params: params,
-      query: query
+      path,
+      name,
+      params,
+      query
     });
 
     if (url) {
@@ -849,18 +767,18 @@ function navigate(navigateParams, navigateOptions) {
     return router;
   }
 
-  var app = router.app;
+  const app = router.app;
   appRouterCheck(router, 'navigate');
 
   if (url === '#' || url === '') {
     return router;
   }
 
-  var navigateUrl = url.replace('./', '');
+  let navigateUrl = url.replace('./', '');
 
   if (navigateUrl[0] !== '/' && navigateUrl.indexOf('#') !== 0) {
-    var currentPath = router.currentRoute.parentPath || router.currentRoute.path;
-    navigateUrl = ((currentPath ? currentPath + "/" : '/') + navigateUrl).replace('///', '/').replace('//', '/');
+    const currentPath = router.currentRoute.parentPath || router.currentRoute.path;
+    navigateUrl = ((currentPath ? `${currentPath}/` : '/') + navigateUrl).replace('///', '/').replace('//', '/');
   }
 
   if (createRoute) {
@@ -876,11 +794,11 @@ function navigate(navigateParams, navigateOptions) {
   }
 
   if (route.route && route.route.viewName) {
-    var anotherViewName = route.route.viewName;
-    var anotherView = app.views[anotherViewName];
+    const anotherViewName = route.route.viewName;
+    const anotherView = app.views[anotherViewName];
 
     if (!anotherView) {
-      throw new Error("Framework7: There is no View with \"" + anotherViewName + "\" name that was specified in this route");
+      throw new Error(`Framework7: There is no View with "${anotherViewName}" name that was specified in this route`);
     }
 
     if (anotherView !== router.view) {
@@ -892,7 +810,7 @@ function navigate(navigateParams, navigateOptions) {
     return redirect.call(router, 'forward', route, navigateOptions);
   }
 
-  var options = {};
+  const options = {};
 
   if (route.route.options) {
     extend(options, route.route.options, navigateOptions);
@@ -901,14 +819,14 @@ function navigate(navigateParams, navigateOptions) {
   }
 
   if (options.openIn && (!router.params.ignoreOpenIn || router.params.ignoreOpenIn && router.history.length > 0)) {
-    return openIn(router, navigateUrl, options);
+    return router.openIn(router, navigateUrl, options);
   }
 
   options.route = route;
 
   function resolve() {
-    var routerLoaded = false;
-    'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(function (modalLoadProp) {
+    let routerLoaded = false;
+    'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(modalLoadProp => {
       if (route.route[modalLoadProp] && !routerLoaded) {
         routerLoaded = true;
         router.modalLoad(modalLoadProp, route, options, 'forward');
@@ -922,23 +840,23 @@ function navigate(navigateParams, navigateOptions) {
       routerLoaded = true;
     }
 
-    'url content component pageName el componentUrl'.split(' ').forEach(function (pageLoadProp) {
+    'url content component pageName el componentUrl'.split(' ').forEach(pageLoadProp => {
       if (route.route[pageLoadProp] && !routerLoaded) {
-        var _load;
-
         routerLoaded = true;
-        load(router, (_load = {}, _load[pageLoadProp] = route.route[pageLoadProp], _load), options, false);
+        load(router, {
+          [pageLoadProp]: route.route[pageLoadProp]
+        }, options, false);
       }
     });
     if (routerLoaded) return; // Async
 
     function asyncResolve(resolveParams, resolveOptions) {
       router.allowPageChange = false;
-      var resolvedAsModal = false;
-      'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(function (modalLoadProp) {
+      let resolvedAsModal = false;
+      'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(modalLoadProp => {
         if (resolveParams[modalLoadProp]) {
           resolvedAsModal = true;
-          var modalRoute = extend({}, route, {
+          const modalRoute = extend({}, route, {
             route: resolveParams
           });
           router.allowPageChange = true;
@@ -956,13 +874,13 @@ function navigate(navigateParams, navigateOptions) {
     if (route.route.async) {
       router.allowPageChange = false;
       route.route.async.call(router, {
-        router: router,
+        router,
         to: options.route,
         from: router.currentRoute,
         resolve: asyncResolve,
         reject: asyncReject,
         direction: 'forward',
-        app: app
+        app
       });
     }
 
@@ -977,8 +895,8 @@ function navigate(navigateParams, navigateOptions) {
 
   if (router.params.masterDetailBreakpoint > 0 && route.route.masterRoute) {
     // load detail route
-    var preloadMaster = true;
-    var masterLoaded = false;
+    let preloadMaster = true;
+    let masterLoaded = false;
 
     if (router.currentRoute && router.currentRoute.route) {
       if ((router.currentRoute.route.master === true || typeof router.currentRoute.route.master === 'function' && router.currentRoute.route.master(app, router)) && (router.currentRoute.route === route.route.masterRoute || router.currentRoute.route.path === route.route.masterRoute.path)) {
@@ -1003,7 +921,7 @@ function navigate(navigateParams, navigateOptions) {
         browserHistory: !navigateOptions.initial,
         history: !navigateOptions.initial,
         once: {
-          pageAfterIn: function pageAfterIn() {
+          pageAfterIn() {
             router.navigate(navigateParams, extend({}, navigateOptions, {
               animate: false,
               reloadAll: false,
@@ -1013,23 +931,24 @@ function navigate(navigateParams, navigateOptions) {
               browserHistory: !navigateOptions.initial
             }));
           }
+
         }
       });
       return router;
     }
   }
 
-  processRouteQueue.call(router, route, router.currentRoute, function () {
+  processRouteQueue.call(router, route, router.currentRoute, () => {
     if (route.route.modules) {
-      app.loadModules(Array.isArray(route.route.modules) ? route.route.modules : [route.route.modules]).then(function () {
+      app.loadModules(Array.isArray(route.route.modules) ? route.route.modules : [route.route.modules]).then(() => {
         resolve();
-      }).catch(function () {
+      }).catch(() => {
         reject();
       });
     } else {
       resolve();
     }
-  }, function () {
+  }, () => {
     reject();
   }, 'forward'); // Return Router