Version 2.10.1 release.

OnsenUI · May 28, 2018 · d76d4f2 · d76d4f2
1 parent 0e03c97
commit d76d4f2
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 CHANGELOG
 ====
 
+2.10.1
+---
+
+ ### Bug Fixes
+
+ * ons-tabbar: Fix race condition with some tabs ([#2430](https://github.com/OnsenUI/OnsenUI/issues/2430))
+ * ons-list-item: Fix expandable item breaking when compiled more than once (for example, with ng-repeat) ([#2434](https://github.com/OnsenUI/OnsenUI/issues/2434))
+
 2.10.0
 ---
 

diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ See the [Onsen UI Getting Started Page](http://onsen.io/v2/guide/) for more info
 Onsen UI is tested to work with the following browsers and mobile OS.
 
  * Android 4.4.4+
- * iOS 8+
+ * iOS 9+
  * Chrome
  * Safari
 

diff --git a/css/onsenui-core.css b/css/onsenui-core.css
@@ -1,4 +1,4 @@
-/*! onsenui - v2.10.0 - 2018-05-17 */
+/*! onsenui - v2.10.1 - 2018-05-28 */
 ons-page, ons-navigator,
 ons-tabbar,
 ons-gesture-detector {

diff --git a/css/onsenui-core.min.css b/css/onsenui-core.min.css
diff --git a/css/onsenui.css b/css/onsenui.css
@@ -1,4 +1,4 @@
-/*! onsenui - v2.10.0 - 2018-05-17 */
+/*! onsenui - v2.10.1 - 2018-05-28 */
 @import url("ionicons/css/ionicons.min.css");
 @import url("material-design-iconic-font/css/material-design-iconic-font.min.css");
 @import url("font_awesome/css/font-awesome.min.css");

diff --git a/css/onsenui.min.css b/css/onsenui.min.css
diff --git a/esm/elements/ons-list-item/index.js b/esm/elements/ons-list-item/index.js
@@ -196,10 +196,13 @@ var ListItemElement = function (_BaseElement) {
       var left = void 0,
           center = void 0,
           right = void 0,
+          top = void 0,
           expandableContent = void 0;
 
-      for (var i = 0; i < this.children.length; i++) {
-        var el = this.children[i];
+      var childEls = util.getAllChildNodes(this);
+
+      for (var i = 0; i < childEls.length; i++) {
+        var el = childEls[i];
 
         if (el.classList.contains('left')) {
           el.classList.add('list-item__left');
@@ -209,6 +212,9 @@ var ListItemElement = function (_BaseElement) {
         } else if (el.classList.contains('right')) {
           el.classList.add('list-item__right');
           right = el;
+        } else if (el.classList.contains('top')) {
+          el.classList.add('list-item__top');
+          top = el;
         } else if (el.classList.contains('expandable-content')) {
           el.classList.add('list-item__expandable-content');
           expandableContent = el;
@@ -252,7 +258,7 @@ var ListItemElement = function (_BaseElement) {
       if (expandableContent) {
         // create 'top' div
         // this holds everything except the expandable content
-        this._top = document.createElement('div');
+        this._top = top || document.createElement('div');
         this._top.classList.add('top', 'list-item__top');
         this.appendChild(this._top);
 

diff --git a/esm/elements/ons-tabbar/index.js b/esm/elements/ons-tabbar/index.js
@@ -226,10 +226,10 @@ var TabbarElement = function (_BaseElement) {
 
     var _this = _possibleConstructorReturn(this, (TabbarElement.__proto__ || _Object$getPrototypeOf(TabbarElement)).call(this));
 
+    _this._loadInactive = util.defer(); // Improves #2324
     contentReady(_this, function () {
       return _this._compile();
     });
-    _this._loadInactive = util.defer(); // Improves #2324
     return _this;
   }
 

diff --git a/esm/index.js b/esm/index.js
diff --git a/esm/ons/util.js b/esm/ons/util.js
@@ -1,6 +1,8 @@
 import _Promise from 'babel-runtime/core-js/promise';
 import _typeof from 'babel-runtime/helpers/typeof';
 import _Object$keys from 'babel-runtime/core-js/object/keys';
+import _Array$from from 'babel-runtime/core-js/array/from';
+import _toConsumableArray from 'babel-runtime/helpers/toConsumableArray';
 /*
 Copyright 2013-2015 ASIAL CORPORATION
 
@@ -149,6 +151,18 @@ util.hasAnyComponentAsParent = function (element) {
   return false;
 };
 
+/**
+ * @param {Object} element
+ * @return {Array}
+ */
+util.getAllChildNodes = function (element) {
+  var _ref;
+
+  return (_ref = [element]).concat.apply(_ref, _toConsumableArray(_Array$from(element.children).map(function (childEl) {
+    return util.getAllChildNodes(childEl);
+  })));
+};
+
 /**
  * @param {Element} element
  * @return {boolean}

diff --git a/js/angular-onsenui.js b/js/angular-onsenui.js
diff --git a/js/angular-onsenui.min.js b/js/angular-onsenui.min.js
diff --git a/js/onsenui.js b/js/onsenui.js
diff --git a/js/onsenui.min.js b/js/onsenui.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "onsenui",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "HTML5 Mobile Framework & UI Components",
   "private": false,
   "author": "@kruyvanna",