diff options
| author | hwc487 | 2012-06-12 15:52:35 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-12 15:52:35 -0700 |
| commit | 9490f816924e9e9c9970ef9384241c07ec0a6e9f (patch) | |
| tree | f44449a2e0055e21960a5513fb3a0738a91db528 /js/document/templates/app/main.js | |
| parent | b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b (diff) | |
| parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
| download | ninja-9490f816924e9e9c9970ef9384241c07ec0a6e9f.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
Diffstat (limited to 'js/document/templates/app/main.js')
| -rw-r--r-- | js/document/templates/app/main.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js index fbd2e138..0cdf718c 100644 --- a/js/document/templates/app/main.js +++ b/js/document/templates/app/main.js | |||
| @@ -81,6 +81,7 @@ exports.Main = Montage.create(Component, { | |||
| 81 | // | 81 | // |
| 82 | var templateEvent = document.createEvent("CustomEvent"); | 82 | var templateEvent = document.createEvent("CustomEvent"); |
| 83 | templateEvent.initCustomEvent("mjsTemplateReady", false, true); | 83 | templateEvent.initCustomEvent("mjsTemplateReady", false, true); |
| 84 | document.body.dispatchEvent(templateEvent); | ||
| 84 | } | 85 | } |
| 85 | }, | 86 | }, |
| 86 | 87 | ||