diff options
author | John Mayhew | 2012-02-16 17:25:30 -0800 |
---|---|---|
committer | John Mayhew | 2012-02-16 17:25:30 -0800 |
commit | 9bba936942dcc6cbda66d72110548e29866285d3 (patch) | |
tree | 97d5a13e7e7ea6723ee91cab68f1f4e8fc427a88 /js/models | |
parent | a66bf533daccc3b850b7af12d7fd335fbd406beb (diff) | |
parent | f0590347bc5fe810838b14a6035fbef35b5616c5 (diff) | |
download | ninja-9bba936942dcc6cbda66d72110548e29866285d3.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
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 | }, |