diff options
author | Eric Guzman | 2012-02-16 14:20:40 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-16 14:20:40 -0800 |
commit | 6960f62a84b946c92a59e5f5dc537a818f9f62b8 (patch) | |
tree | 49cbff3fdd8dab11846e5a278406915ec0ec1508 /node_modules/montage/ui/composer/composer.js | |
parent | 82b1a273219f0ae3d119e156c7acccdbe478f441 (diff) | |
parent | 81942bd52f0713c9ff5d479ebd12fce577f45e45 (diff) | |
download | ninja-6960f62a84b946c92a59e5f5dc537a818f9f62b8.tar.gz |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'node_modules/montage/ui/composer/composer.js')
-rw-r--r-- | node_modules/montage/ui/composer/composer.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/node_modules/montage/ui/composer/composer.js b/node_modules/montage/ui/composer/composer.js index eee7be67..52027a7c 100644 --- a/node_modules/montage/ui/composer/composer.js +++ b/node_modules/montage/ui/composer/composer.js | |||
@@ -47,7 +47,6 @@ exports.Composer = Montage.create(Montage, /** @lends module:montage/ui/composer | |||
47 | * cycle after addComposer has been called on its associated component. If | 47 | * cycle after addComposer has been called on its associated component. If |
48 | * `true` loading of the composer is delayed until its associated component | 48 | * `true` loading of the composer is delayed until its associated component |
49 | * has prepareForActivationEvents called. | 49 | * has prepareForActivationEvents called. |
50 | * @property | ||
51 | * @default false | 50 | * @default false |
52 | */ | 51 | */ |
53 | lazyLoad: { | 52 | lazyLoad: { |