diff options
author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/models | |
parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/models')
-rw-r--r-- | js/models/shape-model.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/models/shape-model.js b/js/models/shape-model.js index b643a7b5..58a88fd0 100644 --- a/js/models/shape-model.js +++ b/js/models/shape-model.js | |||
@@ -10,6 +10,7 @@ var Montage = require("montage/core/core").Montage, | |||
10 | exports.ShapeModel = Montage.create(Component, { | 10 | exports.ShapeModel = Montage.create(Component, { |
11 | 11 | ||
12 | shapeCount: { value: 0 }, | 12 | shapeCount: { value: 0 }, |
13 | useWebGl: { value: false }, | ||
13 | 14 | ||
14 | GLWorld: { value: null }, | 15 | GLWorld: { value: null }, |
15 | GLGeomObj: { value: null }, | 16 | GLGeomObj: { value: null }, |
@@ -17,14 +18,12 @@ exports.ShapeModel = Montage.create(Component, { | |||
17 | strokeSize: { value: null }, | 18 | strokeSize: { value: null }, |
18 | stroke: { value: null }, | 19 | stroke: { value: null }, |
19 | strokeMaterial: { value: null }, | 20 | strokeMaterial: { value: null }, |
20 | strokeMaterialIndex: { value: null }, | ||
21 | strokeStyle: { value: null }, | 21 | strokeStyle: { value: null }, |
22 | strokeStyleIndex: { value: null }, | 22 | strokeStyleIndex: { value: null }, |
23 | border: { value: null }, // Store css value for ColorController | 23 | border: { value: null }, // Store css value for ColorController |
24 | 24 | ||
25 | fill: { value: null }, | 25 | fill: { value: null }, |
26 | fillMaterial: { value: null }, | 26 | fillMaterial: { value: null }, |
27 | fillMaterialIndex: { value: null }, | ||
28 | background: { value: null }, // Store css value for ColorController | 27 | background: { value: null }, // Store css value for ColorController |
29 | 28 | ||
30 | // Line-specific | 29 | // Line-specific |