From 845b625c35b85e88008c44f0864922c835586c04 Mon Sep 17 00:00:00 2001 From: Paul Falgout Date: Wed, 18 Jul 2018 15:39:19 +0900 Subject: [PATCH] Merge branch 'master' into next --- docs/backbone.radio.md | 2 +- docs/marionette.region.md | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/backbone.radio.md b/docs/backbone.radio.md index 05673af37d..d06b7fe7b8 100644 --- a/docs/backbone.radio.md +++ b/docs/backbone.radio.md @@ -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 diff --git a/docs/marionette.region.md b/docs/marionette.region.md index 4aa7d96a32..1b7911c55f 100644 --- a/docs/marionette.region.md +++ b/docs/marionette.region.md @@ -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'));