Merge pull request #953 from OnsenUI/tabbar-fix

fix(ons-tabbar): closes #948
OnsenUI · Oct 21, 2015 · e0ffade · e0ffade
2 parents 08fa09e + 941b74c
commit e0ffade
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,7 @@ v2.0.0-alpha.5
  * ons-toolbar: Added "material" modifier.
  * ons-back-button: Change style when parent toolbar has modifier "material".
  * ons-list: Added "material" modifier.
+ * ons-tabbar: Fixed [#929](https://github.com/OnsenUI/OnsenUI/issues/948)
  * dependencies: Fixed [#936](https://github.com/OnsenUI/OnsenUI/issues/936).
  * ons-splitter: Fixed [#952](https://github.com/OnsenUI/OnsenUI/issues/952).
  * ons-lazy-repeat: Fixed [#966](https://github.com/OnsenUI/OnsenUI/issues/966).

diff --git a/framework/views/tabbarView.js b/framework/views/tabbarView.js
@@ -36,6 +36,7 @@ limitations under the License.
         this._element = element;
         this._attrs = attrs;
         this._lastPageElement = null;
+        this._lastPageScope = null;
 
         this._scope.$on('$destroy', this._destroy.bind(this));
 
@@ -68,11 +69,12 @@ limitations under the License.
 
       _onPrechange: function(event) {
         this._lastPageElement = this._element[0]._getCurrentPageElement();
+        this._lastPageScope = angular.element(this._lastPageElement).scope();
       },
 
       _onPostchange: function(event) {
-        if (this._lastPageElement && !this._lastPageElement.parentNode) {
-          angular.element(this._lastPageElement).scope().$destroy();
+        if (this._lastPageElement && !this._lastPageElement.parentNode && this._lastPageScope) {
+          this._lastPageScope.$destroy();
         }
       },