3.0.0-beta.11 release

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 # Change Log
 
+# [v3.0.0-beta.11](https://github.com/framework7io/framework7/compare/v3.0.0-beta.10...v3.0.0-beta.11) - June 19, 2018
+  * Core
+    * Fix touch ripple issues that happen from time to time in Edge
+    * Fix minor push state issues in Edge
+    * Device util now has additional detections props: `windowsPhone`, `windows`, `macos`, `ie`, `edge`
+
 # [v3.0.0-beta.10](https://github.com/framework7io/framework7/compare/v3.0.0-beta.9...v3.0.0-beta.10) - June 15, 2018
   * Core
     * All new Gauge component with responsive SVG gauges

packages/core/components/touch-ripple/touch-ripple-class.js

@@ -29,7 +29,9 @@ export default class TouchRipple {
   }
   onRemove() {
     let ripple = this;
-    ripple.$rippleWaveEl.remove();
+    if (ripple.$rippleWaveEl) {
+      ripple.$rippleWaveEl.remove();
+    }
     Object.keys(ripple).forEach((key) => {
       ripple[key] = null;
       delete ripple[key];

packages/core/css/framework7.css

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 html,
 body,

packages/core/css/framework7.ios.css

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 html,
 body,

packages/core/css/framework7.md.css

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 html,
 body,

packages/core/css/framework7.rtl.css

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 html {
   direction: rtl;

packages/core/css/framework7.rtl.ios.css

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 html {
   direction: rtl;

packages/core/css/framework7.rtl.md.css

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 html {
   direction: rtl;

packages/core/framework7.esm.bundle.js

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 
 import Template7 from 'template7';

packages/core/framework7.esm.js

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 
 import Template7 from 'template7';

packages/core/framework7.less

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 
 @import (reference) './less/mixins.less';

packages/core/js/framework7.js

@@ -1,13 +1,13 @@
 /**
- * Framework7 3.0.0-beta.10
+ * Framework7 3.0.0-beta.11
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
  * Copyright 2014-2018 Vladimir Kharlampidi
  *
  * Released under the MIT License
  *
- * Released on: June 15, 2018
+ * Released on: June 19, 2018
  */
 
 (function (global, factory) {
@@ -2639,7 +2639,7 @@
         try {
           object[key] = null;
         } catch (e) {
-          // no getter for object
+          // no setter for object
         }
         try {
           delete object[key];
@@ -2861,35 +2861,46 @@
   };
 
   var Device = (function Device() {
+    var platform = win.navigator.platform;
     var ua = win.navigator.userAgent;
 
     var device = {
       ios: false,
       android: false,
       androidChrome: false,
       desktop: false,
-      windows: false,
+      windowsPhone: false,
       iphone: false,
       iphoneX: false,
       ipod: false,
       ipad: false,
-      cordova: win.cordova || win.phonegap,
-      phonegap: win.cordova || win.phonegap,
+      edge: false,
+      ie: false,
+      macos: false,
+      windows: false,
+      cordova: !!(win.cordova || win.phonegap),
+      phonegap: !!(win.cordova || win.phonegap),
     };
 
-    var windows = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/); // eslint-disable-line
+    var windowsPhone = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/); // eslint-disable-line
     var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/); // eslint-disable-line
     var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
     var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
     var iphone = !ipad && ua.match(/(iPhone\sOS|iOS)\s([\d_]+)/);
     var iphoneX = iphone && win.screen.width === 375 && win.screen.height === 812;
+    var ie = ua.indexOf('MSIE ') >= 0 || ua.indexOf('Trident/') >= 0;
+    var edge = ua.indexOf('Edge/') >= 0;
+    var macos = platform === 'MacIntel';
+    var windows = platform === 'Win32';
 
+    device.ie = ie;
+    device.edge = edge;
 
     // Windows
-    if (windows) {
+    if (windowsPhone) {
       device.os = 'windows';
       device.osVersion = windows[2];
-      device.windows = true;
+      device.windowsPhone = true;
     }
     // Android
     if (android && !windows) {
@@ -2930,6 +2941,10 @@
 
     // Desktop
     device.desktop = !(device.os || device.android || device.webView);
+    if (device.desktop) {
+      device.macos = macos;
+      device.windows = windows;
+    }
 
     // Minimal UI
     if (device.os && device.os === 'ios') {
@@ -7040,9 +7055,11 @@
     }
 
     // History State
-    if (router.params.pushState && options.pushState) {
-      if (backIndex) { History.go(-backIndex); }
-      else { History.back(); }
+    if (!(Device.ie || Device.edge)) {
+      if (router.params.pushState && options.pushState) {
+        if (backIndex) { History.go(-backIndex); }
+        else { History.back(); }
+      }
     }
 
     // Update History
@@ -7063,6 +7080,14 @@
     // Current Route
     router.currentRoute = options.route;
 
+    // History State
+    if (Device.ie || Device.edge) {
+      if (router.params.pushState && options.pushState) {
+        if (backIndex) { History.go(-backIndex); }
+        else { History.back(); }
+      }
+    }
+
     // Insert Page
     insertPage();
 
@@ -7116,7 +7141,7 @@
 
       // Preload previous page
       var preloadPreviousPage = app.theme === 'ios' ? (router.params.preloadPreviousPage || router.params.iosSwipeBack) : router.params.preloadPreviousPage;
-      if (preloadPreviousPage) {
+      if (preloadPreviousPage && router.history[router.history.length - 2]) {
         router.back(router.history[router.history.length - 2], { preload: true });
       }
       if (router.params.pushState) {
@@ -10031,7 +10056,9 @@
   };
   TouchRipple.prototype.onRemove = function onRemove () {
     var ripple = this;
-    ripple.$rippleWaveEl.remove();
+    if (ripple.$rippleWaveEl) {
+      ripple.$rippleWaveEl.remove();
+    }
     Object.keys(ripple).forEach(function (key) {
       ripple[key] = null;
       delete ripple[key];

packages/core/modules/router/back.js

@@ -1,6 +1,7 @@
 import $ from 'dom7';
 import { document } from 'ssr-window';
 import Utils from '../../utils/utils';
+import Device from '../../utils/device';
 import History from '../../utils/history';
 import redirect from './redirect';
 import preRoute from './pre-route';
@@ -198,9 +199,11 @@ function backward(el, backwardOptions) {
   }
 
   // History State
-  if (router.params.pushState && options.pushState) {
-    if (backIndex) History.go(-backIndex);
-    else History.back();
+  if (!(Device.ie || Device.edge)) {
+    if (router.params.pushState && options.pushState) {
+      if (backIndex) History.go(-backIndex);
+      else History.back();
+    }
   }
 
   // Update History
@@ -221,6 +224,14 @@ function backward(el, backwardOptions) {
   // Current Route
   router.currentRoute = options.route;
 
+  // History State
+  if (Device.ie || Device.edge) {
+    if (router.params.pushState && options.pushState) {
+      if (backIndex) History.go(-backIndex);
+      else History.back();
+    }
+  }
+
   // Insert Page
   insertPage();
 
@@ -274,7 +285,7 @@ function backward(el, backwardOptions) {
 
     // Preload previous page
     const preloadPreviousPage = app.theme === 'ios' ? (router.params.preloadPreviousPage || router.params.iosSwipeBack) : router.params.preloadPreviousPage;
-    if (preloadPreviousPage) {
+    if (preloadPreviousPage && router.history[router.history.length - 2]) {
       router.back(router.history[router.history.length - 2], { preload: true });
     }
     if (router.params.pushState) {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework7",
-  "version": "3.0.0-beta.10",
+  "version": "3.0.0-beta.11",
   "description": "Full featured mobile HTML framework for building iOS & Android apps",
   "main": "js/framework7.js",
   "jsnext:main": "framework7.esm.js",