4.4.6 release

framework7io · Jul 1, 2019 · f85ba05 · f85ba05
1 parent df8dfca
commit f85ba05
Show file tree

Hide file tree

Showing 30 changed files with 110 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 # Change Log
 
+# [v4.4.6](https://github.com/framework7io/framework7/compare/v4.4.5...v4.4.6) - July 1, 2019
+  * Core
+    * Router
+      * Fixed issue when loading detail page in (Master Detail) with `reloadAll` loaded only detail page
+
 # [v4.4.5](https://github.com/framework7io/framework7/compare/v4.4.3...v4.4.5) - June 27, 2019
   * Core
     * Router

diff --git a/packages/core/css/framework7.bundle.css b/packages/core/css/framework7.bundle.css
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 /*====================

diff --git a/packages/core/css/framework7.bundle.min.css b/packages/core/css/framework7.bundle.min.css
diff --git a/packages/core/css/framework7.bundle.rtl.css b/packages/core/css/framework7.bundle.rtl.css
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 /*====================

diff --git a/packages/core/css/framework7.bundle.rtl.min.css b/packages/core/css/framework7.bundle.rtl.min.css
diff --git a/packages/core/css/framework7.css b/packages/core/css/framework7.css
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 /*====================

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,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 /*====================

diff --git a/packages/core/css/framework7.rtl.min.css b/packages/core/css/framework7.rtl.min.css
diff --git a/packages/core/framework7.bundle.less b/packages/core/framework7.bundle.less
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 @import (reference) './less/mixins.less';

diff --git a/packages/core/framework7.esm.bundle.js b/packages/core/framework7.esm.bundle.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 import Template7 from 'template7';

diff --git a/packages/core/framework7.esm.js b/packages/core/framework7.esm.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 import Template7 from 'template7';

diff --git a/packages/core/framework7.less b/packages/core/framework7.less
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 @import (reference) './less/mixins.less';

diff --git a/packages/core/js/framework7.bundle.js b/packages/core/js/framework7.bundle.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 (function (global, factory) {
@@ -7141,15 +7141,28 @@
     if (router.params.masterDetailBreakpoint > 0 && route.route.masterRoute) {
       // load detail route
       var preloadMaster = true;
+      var masterLoaded = false;
       if (router.currentRoute && router.currentRoute.route) {
-        if (router.currentRoute.route.master && (router.currentRoute.route === route.route.masterRoute || router.currentRoute.route.path === route.route.masterRoute.path)) {
+        if (
+          router.currentRoute.route.master
+          && (
+            router.currentRoute.route === route.route.masterRoute
+            || router.currentRoute.route.path === route.route.masterRoute.path
+          )
+        ) {
           preloadMaster = false;
         }
-        if (router.currentRoute.route.masterRoute && ((router.currentRoute.route.masterRoute === route.route.masterRoute) || (router.currentRoute.route.masterRoute.path === route.route.masterRoute.path))) {
+        if (
+          router.currentRoute.route.masterRoute
+          && (router.currentRoute.route.masterRoute === route.route.masterRoute
+            || router.currentRoute.route.masterRoute.path === route.route.masterRoute.path
+          )
+        ) {
           preloadMaster = false;
+          masterLoaded = true;
         }
       }
-      if (preloadMaster) {
+      if (preloadMaster || (masterLoaded && navigateOptions.reloadAll)) {
         router.navigate(route.route.masterRoute.path, {
           animate: false,
           reloadAll: navigateOptions.reloadAll,

diff --git a/packages/core/js/framework7.bundle.min.js b/packages/core/js/framework7.bundle.min.js
diff --git a/packages/core/js/framework7.bundle.min.js.map b/packages/core/js/framework7.bundle.min.js.map
diff --git a/packages/core/js/framework7.js b/packages/core/js/framework7.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 4.4.5
+ * Framework7 4.4.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 (function (global, factory) {
@@ -7141,15 +7141,28 @@
     if (router.params.masterDetailBreakpoint > 0 && route.route.masterRoute) {
       // load detail route
       var preloadMaster = true;
+      var masterLoaded = false;
       if (router.currentRoute && router.currentRoute.route) {
-        if (router.currentRoute.route.master && (router.currentRoute.route === route.route.masterRoute || router.currentRoute.route.path === route.route.masterRoute.path)) {
+        if (
+          router.currentRoute.route.master
+          && (
+            router.currentRoute.route === route.route.masterRoute
+            || router.currentRoute.route.path === route.route.masterRoute.path
+          )
+        ) {
           preloadMaster = false;
         }
-        if (router.currentRoute.route.masterRoute && ((router.currentRoute.route.masterRoute === route.route.masterRoute) || (router.currentRoute.route.masterRoute.path === route.route.masterRoute.path))) {
+        if (
+          router.currentRoute.route.masterRoute
+          && (router.currentRoute.route.masterRoute === route.route.masterRoute
+            || router.currentRoute.route.masterRoute.path === route.route.masterRoute.path
+          )
+        ) {
           preloadMaster = false;
+          masterLoaded = true;
         }
       }
-      if (preloadMaster) {
+      if (preloadMaster || (masterLoaded && navigateOptions.reloadAll)) {
         router.navigate(route.route.masterRoute.path, {
           animate: false,
           reloadAll: navigateOptions.reloadAll,

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/navigate.js b/packages/core/modules/router/navigate.js
@@ -788,15 +788,28 @@ function navigate(navigateParams, navigateOptions = {}) {
   if (router.params.masterDetailBreakpoint > 0 && route.route.masterRoute) {
     // load detail route
     let preloadMaster = true;
+    let masterLoaded = false;
     if (router.currentRoute && router.currentRoute.route) {
-      if (router.currentRoute.route.master && (router.currentRoute.route === route.route.masterRoute || router.currentRoute.route.path === route.route.masterRoute.path)) {
+      if (
+        router.currentRoute.route.master
+        && (
+          router.currentRoute.route === route.route.masterRoute
+          || router.currentRoute.route.path === route.route.masterRoute.path
+        )
+      ) {
         preloadMaster = false;
       }
-      if (router.currentRoute.route.masterRoute && ((router.currentRoute.route.masterRoute === route.route.masterRoute) || (router.currentRoute.route.masterRoute.path === route.route.masterRoute.path))) {
+      if (
+        router.currentRoute.route.masterRoute
+        && (router.currentRoute.route.masterRoute === route.route.masterRoute
+          || router.currentRoute.route.masterRoute.path === route.route.masterRoute.path
+        )
+      ) {
         preloadMaster = false;
+        masterLoaded = true;
       }
     }
-    if (preloadMaster) {
+    if (preloadMaster || (masterLoaded && navigateOptions.reloadAll)) {
       router.navigate(route.route.masterRoute.path, {
         animate: false,
         reloadAll: navigateOptions.reloadAll,

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7",
-  "version": "4.4.5",
+  "version": "4.4.6",
   "description": "Full featured mobile HTML framework for building iOS & Android apps",
   "main": "js/framework7.js",
   "typings": "js/framework7.d.ts",

diff --git a/packages/react/framework7-react.bundle.js b/packages/react/framework7-react.bundle.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 React 4.4.5
+ * Framework7 React 4.4.6
  * Build full featured iOS & Android apps using Framework7 & React
  * http://framework7.io/react/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 (function (global, factory) {
@@ -13798,15 +13798,15 @@
   };
 
   /**
-   * Framework7 React 4.4.5
+   * Framework7 React 4.4.6
    * Build full featured iOS & Android apps using Framework7 & React
    * http://framework7.io/react/
    *
    * Copyright 2014-2019 Vladimir Kharlampidi
    *
    * Released under the MIT License
    *
-   * Released on: June 27, 2019
+   * Released on: July 1, 2019
    */
 
   var Plugin = {

diff --git a/packages/react/framework7-react.bundle.min.js b/packages/react/framework7-react.bundle.min.js
diff --git a/packages/react/framework7-react.esm.js b/packages/react/framework7-react.esm.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 React 4.4.5
+ * Framework7 React 4.4.6
  * Build full featured iOS & Android apps using Framework7 & React
  * http://framework7.io/react/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 import F7AccordionContent from './components/accordion-content';

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7-react",
-  "version": "4.4.5",
+  "version": "4.4.6",
   "description": "Build full featured iOS & Android apps using Framework7 & React",
   "main": "framework7-react.bundle.js",
   "typings": "framework7-react.d.ts",

diff --git a/packages/vue/framework7-vue.bundle.js b/packages/vue/framework7-vue.bundle.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 Vue 4.4.5
+ * Framework7 Vue 4.4.6
  * Build full featured iOS & Android apps using Framework7 & Vue
  * http://framework7.io/vue/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 (function (global, factory) {
@@ -12283,15 +12283,15 @@
   };
 
   /**
-   * Framework7 Vue 4.4.5
+   * Framework7 Vue 4.4.6
    * Build full featured iOS & Android apps using Framework7 & Vue
    * http://framework7.io/vue/
    *
    * Copyright 2014-2019 Vladimir Kharlampidi
    *
    * Released under the MIT License
    *
-   * Released on: June 27, 2019
+   * Released on: July 1, 2019
    */
 
   var Plugin = {

diff --git a/packages/vue/framework7-vue.bundle.min.js b/packages/vue/framework7-vue.bundle.min.js
diff --git a/packages/vue/framework7-vue.esm.bundle.js b/packages/vue/framework7-vue.esm.bundle.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 Vue 4.4.5
+ * Framework7 Vue 4.4.6
  * Build full featured iOS & Android apps using Framework7 & Vue
  * http://framework7.io/vue/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 import Vue from 'vue';
 import f7AccordionContent from './components/accordion-content';

diff --git a/packages/vue/framework7-vue.esm.js b/packages/vue/framework7-vue.esm.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 Vue 4.4.5
+ * Framework7 Vue 4.4.6
  * Build full featured iOS & Android apps using Framework7 & Vue
  * http://framework7.io/vue/
  *
  * Copyright 2014-2019 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 27, 2019
+ * Released on: July 1, 2019
  */
 
 import f7AccordionContent from './components/accordion-content';