Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
paulfalgout committed Jul 23, 2018
1 parent a9bbeeb commit 845b625
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/backbone.radio.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ as a dependency.
* `channelName` - defines the Radio channel that will be used for the requests and/or events
* `getChannel()` - returns a Radio.Channel instance using `channelName`
* `radioEvents` - defines an events hash with the events to be listened and its respective handlers
* `radioRequets` - defines an events hash with the requests to be replied and its respective handlers
* `radioRequests` - defines an events hash with the requests to be replied and its respective handlers

### Examples

Expand Down
7 changes: 2 additions & 5 deletions docs/marionette.region.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,12 +397,9 @@ instantiated using the template.
```javascript
const myView = new MyView();

const template = _.template('This is the <%- section %> page');
const templateContext = templateContext: { section: 'main' };

myView.showChildView('main', {
template: template,
templateContext: templateContext
template: _.template('This is the <%- section %> page'),
templateContext: { section: 'main' }
});

myView.showChildView('header', _.template('Welcome to the site'));
Expand Down

0 comments on commit 845b625

Please sign in to comment.