diff options
author | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
commit | abf78e2d7a97d295ce5a1c425fd359d47379137e (patch) | |
tree | d08c91bd2aef31e6325e0b499b2ffc390018bec6 /js/models | |
parent | e80a79bff57fecf3aa9b869d8ed2de5fd815287c (diff) | |
parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
download | ninja-abf78e2d7a97d295ce5a1c425fd359d47379137e.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/models')
-rwxr-xr-x[-rw-r--r--] | js/models/app-model.js | 25 | ||||
-rwxr-xr-x[-rw-r--r--] | js/models/color-model.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/models/element-model.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/models/properties-3d.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/models/shape-model.js | 0 |
5 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 | }, |
diff --git a/js/models/color-model.js b/js/models/color-model.js index 2c86422f..2c86422f 100644..100755 --- a/js/models/color-model.js +++ b/js/models/color-model.js | |||
diff --git a/js/models/element-model.js b/js/models/element-model.js index 831e8b1e..831e8b1e 100644..100755 --- a/js/models/element-model.js +++ b/js/models/element-model.js | |||
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js index cf4a045f..cf4a045f 100644..100755 --- a/js/models/properties-3d.js +++ b/js/models/properties-3d.js | |||
diff --git a/js/models/shape-model.js b/js/models/shape-model.js index 58a88fd0..58a88fd0 100644..100755 --- a/js/models/shape-model.js +++ b/js/models/shape-model.js | |||