diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/models/app-model.js | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/models/app-model.js')
-rwxr-xr-x[-rw-r--r--] | js/models/app-model.js | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/js/models/app-model.js b/js/models/app-model.js index 57394bb9..1c599a32 100644..100755 --- a/js/models/app-model.js +++ b/js/models/app-model.js | |||
@@ -21,6 +21,18 @@ exports.AppModel = Montage.create(Component, { | |||
21 | this._livePreview = value; | 21 | this._livePreview = value; |
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | _chromePreview: { | ||
25 | value: false | ||
26 | }, | ||
27 | |||
28 | chromePreview: { | ||
29 | get: function() { | ||
30 | return this._chromePreview; | ||
31 | }, | ||
32 | set: function(value) { | ||
33 | this._chromePreview = value; | ||
34 | } | ||
35 | }, | ||
24 | 36 | ||
25 | _layoutView: { | 37 | _layoutView: { |
26 | value: "layoutAll" | 38 | value: "layoutAll" |
@@ -325,6 +337,19 @@ exports.AppModel = Montage.create(Component, { | |||
325 | } | 337 | } |
326 | }, | 338 | }, |
327 | 339 | ||
340 | _presetsPanel: { | ||
341 | value: true | ||
342 | }, | ||
343 | |||
344 | PresetsPanel: { | ||
345 | get: function() { | ||
346 | return this._presetsPanel; | ||
347 | }, | ||
348 | set: function(value) { | ||
349 | this._presetsPanel = value; | ||
350 | } | ||
351 | }, | ||
352 | |||
328 | _materials: { | 353 | _materials: { |
329 | value: [] | 354 | value: [] |
330 | }, | 355 | }, |