marionette-rails 0.9.2 → 0.9.3
Sign up to get free protection for your applications and to get access to all the features.
@@ -1,4 +1,4 @@
|
|
1
|
-
// Backbone.Marionette v0.9.
|
1
|
+
// Backbone.Marionette v0.9.3
|
2
2
|
//
|
3
3
|
// Copyright (C)2012 Derick Bailey, Muted Solutions, LLC
|
4
4
|
// Distributed Under MIT License
|
@@ -227,6 +227,7 @@ Marionette.ItemView = Marionette.View.extend({
|
|
227
227
|
if (this.onRender){ this.onRender(); }
|
228
228
|
this.trigger("render", this);
|
229
229
|
this.trigger("item:rendered", this);
|
230
|
+
return this;
|
230
231
|
},
|
231
232
|
|
232
233
|
// Override the default close event to add a few
|
@@ -305,6 +306,7 @@ Marionette.CollectionView = Marionette.View.extend({
|
|
305
306
|
}
|
306
307
|
|
307
308
|
this.triggerRendered();
|
309
|
+
return this;
|
308
310
|
},
|
309
311
|
|
310
312
|
// Internal method to loop through each item in the
|
@@ -514,6 +516,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
|
|
514
516
|
|
515
517
|
this.renderCollection();
|
516
518
|
this.trigger("composite:rendered");
|
519
|
+
return this;
|
517
520
|
},
|
518
521
|
|
519
522
|
// Render the collection for the composite view
|
@@ -538,19 +541,19 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
|
|
538
541
|
// provide custom logic of how the child item view instances have their
|
539
542
|
// HTML appended to the composite view instance.
|
540
543
|
appendHtml: function(cv, iv){
|
541
|
-
var $container = this.getItemViewContainer(cv
|
544
|
+
var $container = this.getItemViewContainer(cv);
|
542
545
|
$container.append(iv.el);
|
543
546
|
},
|
544
547
|
|
545
548
|
// Internal method to ensure an `$itemViewContainer` exists, for the
|
546
549
|
// `appendHtml` method to use.
|
547
|
-
getItemViewContainer: function(containerView
|
550
|
+
getItemViewContainer: function(containerView){
|
548
551
|
var container;
|
549
552
|
if ("$itemViewContainer" in containerView){
|
550
553
|
container = containerView.$itemViewContainer;
|
551
554
|
} else {
|
552
555
|
if (containerView.itemViewContainer){
|
553
|
-
container = containerView.$(itemViewContainer);
|
556
|
+
container = containerView.$(_.result(containerView, "itemViewContainer"));
|
554
557
|
} else {
|
555
558
|
container = containerView.$el;
|
556
559
|
}
|