3.0.0-beta.19 release

framework7io · Jul 3, 2018 · c869e09 · c869e09
1 parent 07f092a
commit c869e09
Show file tree

Hide file tree

Showing 33 changed files with 53 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 # Change Log
 
+# [v3.0.0-beta.19](https://github.com/framework7io/framework7/compare/v3.0.0-beta.18...v3.0.0-beta.19) - July 3, 2018
+  * Core
+    * Router
+      * View/Router parameter `beforeLeave` renamed to `routesBeforeLeave`
+      * View/Router parameter `beforeEnter` renamed to `routesBeforeEnter`
+
 # [v3.0.0-beta.18](https://github.com/framework7io/framework7/compare/v3.0.0-beta.17...v3.0.0-beta.18) - July 3, 2018
   * Core
     * Router

diff --git a/packages/core/components/view/view.js b/packages/core/components/view/view.js
@@ -85,6 +85,9 @@ export default {
       // Delays
       iosPageLoadDelay: 0,
       materialPageLoadDelay: 0,
+      // Routes hooks
+      routesBeforeEnter: null,
+      routesBeforeLeave: null,
     },
   },
   static: {

diff --git a/packages/core/css/framework7.css b/packages/core/css/framework7.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.ios.css b/packages/core/css/framework7.ios.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.ios.min.css b/packages/core/css/framework7.ios.min.css
diff --git a/packages/core/css/framework7.md.css b/packages/core/css/framework7.md.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.md.min.css b/packages/core/css/framework7.md.min.css
diff --git a/packages/core/css/framework7.min.css b/packages/core/css/framework7.min.css
diff --git a/packages/core/css/framework7.rtl.css b/packages/core/css/framework7.rtl.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.rtl.ios.css b/packages/core/css/framework7.rtl.ios.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.rtl.ios.min.css b/packages/core/css/framework7.rtl.ios.min.css
diff --git a/packages/core/css/framework7.rtl.md.css b/packages/core/css/framework7.rtl.md.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.rtl.md.min.css b/packages/core/css/framework7.rtl.md.min.css
diff --git a/packages/core/css/framework7.rtl.min.css b/packages/core/css/framework7.rtl.min.css
diff --git a/packages/core/framework7.esm.bundle.js b/packages/core/framework7.esm.bundle.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/framework7.esm.js b/packages/core/framework7.esm.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/framework7.less b/packages/core/framework7.less
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/js/framework7.js b/packages/core/js/framework7.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 3.0.0-beta.18
+ * Framework7 3.0.0-beta.19
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
@@ -5841,11 +5841,11 @@
   function processRouteQueue (to, from, resolve, reject) {
     var router = this;
     function enterNextRoute() {
-      if (to && to.route && (router.params.beforeEnter || to.route.beforeEnter)) {
+      if (to && to.route && (router.params.routesBeforeEnter || to.route.beforeEnter)) {
         router.allowPageChange = false;
         processQueue(
           router,
-          router.params.beforeEnter,
+          router.params.routesBeforeEnter,
           to.route.beforeEnter,
           to,
           from,
@@ -5862,11 +5862,11 @@
       }
     }
     function leaveCurrentRoute() {
-      if (from && from.route && (router.params.beforeLeave || from.route.beforeLeave)) {
+      if (from && from.route && (router.params.routesBeforeLeave || from.route.beforeLeave)) {
         router.allowPageChange = false;
         processQueue(
           router,
-          router.params.beforeLeave,
+          router.params.routesBeforeLeave,
           from.route.beforeLeave,
           to,
           from,
@@ -9477,6 +9477,9 @@
         // Delays
         iosPageLoadDelay: 0,
         materialPageLoadDelay: 0,
+        // Routes hooks
+        routesBeforeEnter: null,
+        routesBeforeLeave: null,
       },
     },
     static: {

diff --git a/packages/core/js/framework7.min.js b/packages/core/js/framework7.min.js
diff --git a/packages/core/js/framework7.min.js.map b/packages/core/js/framework7.min.js.map
diff --git a/packages/core/modules/router/process-route-queue.js b/packages/core/modules/router/process-route-queue.js
@@ -39,11 +39,11 @@ function processQueue(router, routerQueue, routeQueue, to, from, resolve, reject
 export default function (to, from, resolve, reject) {
   const router = this;
   function enterNextRoute() {
-    if (to && to.route && (router.params.beforeEnter || to.route.beforeEnter)) {
+    if (to && to.route && (router.params.routesBeforeEnter || to.route.beforeEnter)) {
       router.allowPageChange = false;
       processQueue(
         router,
-        router.params.beforeEnter,
+        router.params.routesBeforeEnter,
         to.route.beforeEnter,
         to,
         from,
@@ -60,11 +60,11 @@ export default function (to, from, resolve, reject) {
     }
   }
   function leaveCurrentRoute() {
-    if (from && from.route && (router.params.beforeLeave || from.route.beforeLeave)) {
+    if (from && from.route && (router.params.routesBeforeLeave || from.route.beforeLeave)) {
       router.allowPageChange = false;
       processQueue(
         router,
-        router.params.beforeLeave,
+        router.params.routesBeforeLeave,
         from.route.beforeLeave,
         to,
         from,

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7",
-  "version": "3.0.0-beta.18",
+  "version": "3.0.0-beta.19",
   "description": "Full featured mobile HTML framework for building iOS & Android apps",
   "main": "js/framework7.js",
   "jsnext:main": "framework7.esm.js",

diff --git a/packages/react/framework7-react.esm.js b/packages/react/framework7-react.esm.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 React 3.0.0-beta.18
+ * Framework7 React 3.0.0-beta.19
  * Build full featured iOS & Android apps using Framework7 & React
  * http://framework7.io/react/
  *

diff --git a/packages/react/framework7-react.js b/packages/react/framework7-react.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 React 3.0.0-beta.18
+ * Framework7 React 3.0.0-beta.19
  * Build full featured iOS & Android apps using Framework7 & React
  * http://framework7.io/react/
  *
@@ -10626,7 +10626,7 @@
   };
 
   /**
-   * Framework7 React 3.0.0-beta.18
+   * Framework7 React 3.0.0-beta.19
    * Build full featured iOS & Android apps using Framework7 & React
    * http://framework7.io/react/
    *

diff --git a/packages/react/framework7-react.min.js b/packages/react/framework7-react.min.js
diff --git a/packages/react/framework7-react.min.js.map b/packages/react/framework7-react.min.js.map
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7-react",
-  "version": "3.0.0-beta.18",
+  "version": "3.0.0-beta.19",
   "description": "Build full featured iOS & Android apps using Framework7 & React",
   "main": "framework7-react.js",
   "jsnext:main": "framework7-react.esm.js",

diff --git a/packages/vue/framework7-vue.esm.bundle.js b/packages/vue/framework7-vue.esm.bundle.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 Vue 3.0.0-beta.18
+ * Framework7 Vue 3.0.0-beta.19
  * Build full featured iOS & Android apps using Framework7 & Vue
  * http://framework7.io/vue/
  *

diff --git a/packages/vue/framework7-vue.esm.js b/packages/vue/framework7-vue.esm.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 Vue 3.0.0-beta.18
+ * Framework7 Vue 3.0.0-beta.19
  * Build full featured iOS & Android apps using Framework7 & Vue
  * http://framework7.io/vue/
  *

diff --git a/packages/vue/framework7-vue.js b/packages/vue/framework7-vue.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 Vue 3.0.0-beta.18
+ * Framework7 Vue 3.0.0-beta.19
  * Build full featured iOS & Android apps using Framework7 & Vue
  * http://framework7.io/vue/
  *
@@ -9626,7 +9626,7 @@
   };
 
   /**
-   * Framework7 Vue 3.0.0-beta.18
+   * Framework7 Vue 3.0.0-beta.19
    * Build full featured iOS & Android apps using Framework7 & Vue
    * http://framework7.io/vue/
    *

diff --git a/packages/vue/framework7-vue.min.js b/packages/vue/framework7-vue.min.js
diff --git a/packages/vue/framework7-vue.min.js.map b/packages/vue/framework7-vue.min.js.map
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7-vue",
-  "version": "3.0.0-beta.18",
+  "version": "3.0.0-beta.19",
   "description": "Build full featured iOS & Android apps using Framework7 & Vue",
   "main": "framework7-vue.js",
   "jsnext:main": "framework7-vue.esm.js",