5.0.0-beta.2 release

framework7io · Jul 22, 2019 · 52dfc2a · 52dfc2a
1 parent 76f6190
commit 52dfc2a
Show file tree

Hide file tree

Showing 32 changed files with 100 additions and 68 deletions.
diff --git a/packages/core/components/infinite-scroll.js b/packages/core/components/infinite-scroll.js
diff --git a/packages/core/components/infinite-scroll/infinite-scroll.js b/packages/core/components/infinite-scroll/infinite-scroll.js
@@ -38,13 +38,20 @@ const InfiniteScroll = {
   create(el) {
     const $el = $(el);
     const app = this;
-    $el.on('scroll', function handle(e) {
+    function scrollHandler(e) {
       app.infiniteScroll.handle(this, e);
+    }
+    $el.each((index, element) => {
+      element.f7InfiniteScrollHandler = scrollHandler;
+      element.addEventListener('scroll', element.f7InfiniteScrollHandler);
     });
   },
   destroy(el) {
     const $el = $(el);
-    $el.off('scroll');
+    $el.each((index, element) => {
+      element.removeEventListener('scroll', element.f7InfiniteScrollHandler);
+      delete element.f7InfiniteScrollHandler;
+    });
   },
 };
 export default {

diff --git a/packages/core/components/navbar/navbar.js b/packages/core/components/navbar/navbar.js
@@ -428,8 +428,11 @@ const Navbar = {
       previousScrollTop = currentScrollTop;
     }
 
-    function handleScroll() {
+    function handleScroll(e) {
       scrollContent = this;
+      if (e && e.target && e.target !== scrollContent) {
+        return;
+      }
       currentScrollTop = scrollContent.scrollTop;
       scrollChanged = currentScrollTop;
 

diff --git a/packages/core/components/toolbar/toolbar.js b/packages/core/components/toolbar/toolbar.js
@@ -89,8 +89,11 @@ const Toolbar = {
     let reachEnd;
     let action;
     let toolbarHidden;
-    function handleScroll() {
+    function handleScroll(e) {
       const scrollContent = this;
+      if (e && e.target && e.target !== scrollContent) {
+        return;
+      }
       if ($pageEl.hasClass('page-previous')) return;
       currentScrollTop = scrollContent.scrollTop;
       scrollHeight = scrollContent.scrollHeight;

diff --git a/packages/core/css/framework7.bundle.css b/packages/core/css/framework7.bundle.css
@@ -1,13 +1,13 @@
 /**
- * Framework7 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 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 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 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 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 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 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 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 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 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 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 2019
  */
 
 import Template7 from 'template7';

diff --git a/packages/core/framework7.esm.js b/packages/core/framework7.esm.js
@@ -1,13 +1,13 @@
 /**
- * Framework7 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 2019
  */
 
 import Template7 from 'template7';

diff --git a/packages/core/framework7.less b/packages/core/framework7.less
@@ -1,13 +1,13 @@
 /**
- * Framework7 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 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 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 2019
  */
 
 (function (global, factory) {
@@ -12421,8 +12421,11 @@
         previousScrollTop = currentScrollTop;
       }
 
-      function handleScroll() {
+      function handleScroll(e) {
         scrollContent = this;
+        if (e && e.target && e.target !== scrollContent) {
+          return;
+        }
         currentScrollTop = scrollContent.scrollTop;
         scrollChanged = currentScrollTop;
 
@@ -12740,8 +12743,11 @@
       var reachEnd;
       var action;
       var toolbarHidden;
-      function handleScroll() {
+      function handleScroll(e) {
         var scrollContent = this;
+        if (e && e.target && e.target !== scrollContent) {
+          return;
+        }
         if ($pageEl.hasClass('page-previous')) { return; }
         currentScrollTop = scrollContent.scrollTop;
         scrollHeight = scrollContent.scrollHeight;
@@ -25361,13 +25367,20 @@
     create: function create(el) {
       var $el = $(el);
       var app = this;
-      $el.on('scroll', function handle(e) {
+      function scrollHandler(e) {
         app.infiniteScroll.handle(this, e);
+      }
+      $el.each(function (index, element) {
+        element.f7InfiniteScrollHandler = scrollHandler;
+        element.addEventListener('scroll', element.f7InfiniteScrollHandler);
       });
     },
     destroy: function destroy(el) {
       var $el = $(el);
-      $el.off('scroll');
+      $el.each(function (index, element) {
+        element.removeEventListener('scroll', element.f7InfiniteScrollHandler);
+        delete element.f7InfiniteScrollHandler;
+      });
     },
   };
   var InfiniteScroll$1 = {

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 5.0.0-beta.1
+ * Framework7 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 2019
  */
 
 (function (global, factory) {
@@ -12421,8 +12421,11 @@
         previousScrollTop = currentScrollTop;
       }
 
-      function handleScroll() {
+      function handleScroll(e) {
         scrollContent = this;
+        if (e && e.target && e.target !== scrollContent) {
+          return;
+        }
         currentScrollTop = scrollContent.scrollTop;
         scrollChanged = currentScrollTop;
 
@@ -12740,8 +12743,11 @@
       var reachEnd;
       var action;
       var toolbarHidden;
-      function handleScroll() {
+      function handleScroll(e) {
         var scrollContent = this;
+        if (e && e.target && e.target !== scrollContent) {
+          return;
+        }
         if ($pageEl.hasClass('page-previous')) { return; }
         currentScrollTop = scrollContent.scrollTop;
         scrollHeight = scrollContent.scrollHeight;

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/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "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 5.0.0-beta.1
+ * Framework7 React 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 2019
  */
 
 (function (global, factory) {
@@ -13867,15 +13867,15 @@
   };
 
   /**
-   * Framework7 React 5.0.0-beta.1
+   * Framework7 React 5.0.0-beta.2
    * 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: July 19, 2019
+   * Released on: July 22, 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 5.0.0-beta.1
+ * Framework7 React 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 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": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "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 5.0.0-beta.1
+ * Framework7 Vue 5.0.0-beta.2
  * 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: July 19, 2019
+ * Released on: July 22, 2019
  */
 
 (function (global, factory) {
@@ -12352,15 +12352,15 @@
   };
 
   /**
-   * Framework7 Vue 5.0.0-beta.1
+   * Framework7 Vue 5.0.0-beta.2
    * 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: July 19, 2019
+   * Released on: July 22, 2019
    */
 
   var Plugin = {