diff options
| author | Jose Antonio Marquez | 2012-02-17 00:20:42 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-17 00:20:42 -0800 |
| commit | 7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f (patch) | |
| tree | 0a51be74f0d5b1f6c740cd1a9c79e00624a0c0af /js/models | |
| parent | 9fe5d98bf469036c856e28d71ad4160d630b4af4 (diff) | |
| parent | 18a42c37d080c03830c3f0a4156b81044e6309ee (diff) | |
| download | ninja-7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/models')
| -rwxr-xr-x | js/models/app-model.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/js/models/app-model.js b/js/models/app-model.js index 57394bb9..bfa1871c 100755 --- a/js/models/app-model.js +++ b/js/models/app-model.js | |||
| @@ -325,6 +325,19 @@ exports.AppModel = Montage.create(Component, { | |||
| 325 | } | 325 | } |
| 326 | }, | 326 | }, |
| 327 | 327 | ||
| 328 | _presetsPanel: { | ||
| 329 | value: true | ||
| 330 | }, | ||
| 331 | |||
| 332 | PresetsPanel: { | ||
| 333 | get: function() { | ||
| 334 | return this._presetsPanel; | ||
| 335 | }, | ||
| 336 | set: function(value) { | ||
| 337 | this._presetsPanel = value; | ||
| 338 | } | ||
| 339 | }, | ||
| 340 | |||
| 328 | _materials: { | 341 | _materials: { |
| 329 | value: [] | 342 | value: [] |
| 330 | }, | 343 | }, |