Skip to content

Commit

Permalink
Correct the placement of the swapOut trigger to be in accordance with…
Browse files Browse the repository at this point in the history
… the documentation_.

Conflicts:
	src/marionette.region.js
  • Loading branch information
paulovieira authored and samccone committed Sep 21, 2014
1 parent 0258a95 commit d7eca41
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/marionette.region.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,12 @@ _.extend(Marionette.Region.prototype, Backbone.Events, {
this.triggerMethod('before:show', view);
Marionette.triggerMethodOn(view, 'before:show');

this.attachHtml(view);

if (isChangingView) {
this.triggerMethod('swapOut', this.currentView);
}

this.attachHtml(view);
this.currentView = view;

if (isChangingView) {
Expand Down

0 comments on commit d7eca41

Please sign in to comment.