Bump and build v1.8.8

marionettejs · Jun 13, 2014 · 892ae07 · 892ae07
1 parent eed99a8
commit 892ae07
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 22 deletions.
diff --git a/bower.json b/bower.json
@@ -6,7 +6,7 @@
     "./lib/backbone.marionette.js",
     "./lib/core/amd/backbone.marionette.js"
   ],
-  "version": "1.8.7",
+  "version": "1.8.8",
   "keywords": [
     "backbone",
     "framework",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+### v1.8.8 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.8.7...v1.8.8)
+
+  * Fixes
+    * Fixed the case where `onShow` was not called on child view behaviors when inside a `Collection` or `Composite` view.
+
 ### v1.8.7 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.8.6...v1.8.7)
 
   * Fixes

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "repo": "marionettejs/backbone.marionette",
   "main": "lib/core/amd/backbone.marionette.js",
   "keywords": [

diff --git a/lib/backbone.marionette.js b/lib/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.8.7
+// v1.8.8
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -1616,7 +1616,11 @@ Marionette.CollectionView = Marionette.View.extend({
   _triggerShowBufferedChildren: function () {
     if (this._isShown) {
       _.each(this._bufferedChildren, function (child) {
-        Marionette.triggerMethod.call(child, "show");
+        if (_.isFunction(child.triggerMethod)) {
+          child.triggerMethod('show');
+        } else {
+          Marionette.triggerMethod.call(child, 'show');
+        }
       });
       this._bufferedChildren = [];
     }
@@ -1644,7 +1648,11 @@ Marionette.CollectionView = Marionette.View.extend({
   // of child views is called.
   onShowCalled: function(){
     this.children.each(function(child){
-      Marionette.triggerMethod.call(child, "show");
+      if (_.isFunction(child.triggerMethod)) {
+        child.triggerMethod('show');
+      } else {
+        Marionette.triggerMethod.call(child, 'show');
+      }
     });
   },
 
@@ -1770,7 +1778,11 @@ Marionette.CollectionView = Marionette.View.extend({
     // call the "show" method if the collection view
     // has already been shown
     if (this._isShown && !this.isBuffering){
-      Marionette.triggerMethod.call(view, "show");
+      if (_.isFunction(view.triggerMethod)) {
+        view.triggerMethod('show');
+      } else {
+        Marionette.triggerMethod.call(view, 'show');
+      }
     }
 
     // this view was added

diff --git a/lib/backbone.marionette.map b/lib/backbone.marionette.map
diff --git a/lib/backbone.marionette.min.js b/lib/backbone.marionette.min.js
diff --git a/lib/core/amd/backbone.marionette.js b/lib/core/amd/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.8.7
+// v1.8.8
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -1172,7 +1172,11 @@
     _triggerShowBufferedChildren: function () {
       if (this._isShown) {
         _.each(this._bufferedChildren, function (child) {
-          Marionette.triggerMethod.call(child, "show");
+          if (_.isFunction(child.triggerMethod)) {
+            child.triggerMethod('show');
+          } else {
+            Marionette.triggerMethod.call(child, 'show');
+          }
         });
         this._bufferedChildren = [];
       }
@@ -1200,7 +1204,11 @@
     // of child views is called.
     onShowCalled: function(){
       this.children.each(function(child){
-        Marionette.triggerMethod.call(child, "show");
+        if (_.isFunction(child.triggerMethod)) {
+          child.triggerMethod('show');
+        } else {
+          Marionette.triggerMethod.call(child, 'show');
+        }
       });
     },
 
@@ -1326,7 +1334,11 @@
       // call the "show" method if the collection view
       // has already been shown
       if (this._isShown && !this.isBuffering){
-        Marionette.triggerMethod.call(view, "show");
+        if (_.isFunction(view.triggerMethod)) {
+          view.triggerMethod('show');
+        } else {
+          Marionette.triggerMethod.call(view, 'show');
+        }
       }
 
       // this view was added

diff --git a/lib/core/amd/backbone.marionette.min.js b/lib/core/amd/backbone.marionette.min.js
diff --git a/lib/core/backbone.marionette.js b/lib/core/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.8.7
+// v1.8.8
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -1606,7 +1606,11 @@ Marionette.CollectionView = Marionette.View.extend({
   _triggerShowBufferedChildren: function () {
     if (this._isShown) {
       _.each(this._bufferedChildren, function (child) {
-        Marionette.triggerMethod.call(child, "show");
+        if (_.isFunction(child.triggerMethod)) {
+          child.triggerMethod('show');
+        } else {
+          Marionette.triggerMethod.call(child, 'show');
+        }
       });
       this._bufferedChildren = [];
     }
@@ -1634,7 +1638,11 @@ Marionette.CollectionView = Marionette.View.extend({
   // of child views is called.
   onShowCalled: function(){
     this.children.each(function(child){
-      Marionette.triggerMethod.call(child, "show");
+      if (_.isFunction(child.triggerMethod)) {
+        child.triggerMethod('show');
+      } else {
+        Marionette.triggerMethod.call(child, 'show');
+      }
     });
   },
 
@@ -1760,7 +1768,11 @@ Marionette.CollectionView = Marionette.View.extend({
     // call the "show" method if the collection view
     // has already been shown
     if (this._isShown && !this.isBuffering){
-      Marionette.triggerMethod.call(view, "show");
+      if (_.isFunction(view.triggerMethod)) {
+        view.triggerMethod('show');
+      } else {
+        Marionette.triggerMethod.call(view, 'show');
+      }
     }
 
     // this view was added

diff --git a/lib/core/backbone.marionette.map b/lib/core/backbone.marionette.map
diff --git a/lib/core/backbone.marionette.min.js b/lib/core/backbone.marionette.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "main": "lib/core/amd/backbone.marionette.js",
   "keywords": [