aboutsummaryrefslogtreecommitdiff
path: root/js/models/app-model.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-16 17:19:27 -0800
committerJose Antonio Marquez2012-02-16 17:19:27 -0800
commit7e5cbc9eac21b9799581c34bb99aa942d4f9ad10 (patch)
treef925ded2e26ecabd777ead1e443fe09f9a358c70 /js/models/app-model.js
parent2234edc2a3aed40175b5cfb6a9f7aaaea2b7aae6 (diff)
parentf0590347bc5fe810838b14a6035fbef35b5616c5 (diff)
downloadninja-7e5cbc9eac21b9799581c34bb99aa942d4f9ad10.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/models/app-model.js')
-rwxr-xr-xjs/models/app-model.js13
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 },