aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/models
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/models')
-rwxr-xr-xjs/models/element-model.js35
-rwxr-xr-xjs/models/properties-3d.js3
2 files changed, 20 insertions, 18 deletions
diff --git a/js/models/element-model.js b/js/models/element-model.js
index fa02fd38..0e199a67 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -4,7 +4,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */ 5</copyright> */
6 6
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage,
8 Properties3D = require("js/models/properties-3d").Properties3D,
9 ShapeModel = require("js/models/shape-model").ShapeModel,
10 ControllerFactory = require("js/controllers/elements/controller-factory").ControllerFactory;
8 11
9exports.ElementModel = Montage.create(Montage, { 12exports.ElementModel = Montage.create(Montage, {
10 key: { value: "_model_"}, 13 key: { value: "_model_"},
@@ -16,36 +19,36 @@ exports.ElementModel = Montage.create(Montage, {
16 19
17 id: { value: "" }, 20 id: { value: "" },
18 classList: { value: null }, 21 classList: { value: null },
19
20 defaultRule: { value: null }, 22 defaultRule: { value: null },
21 23
22 top: { value: null }, 24 top: { value: null },
23 left: { value: null }, 25 left: { value: null },
24 width: { value: null }, 26 width: { value: null },
25 height: { value: null }, 27 height: { value: null },
26
27 /**
28 * Properties 3D
29 */
30 props3D: { value: null }, 28 props3D: { value: null },
31 29
32 /**
33 * Shape Info
34 */
35 isShape: { value: false }, 30 isShape: { value: false },
36 shapeModel: { value: null }, 31 shapeModel: { value: null },
37
38 /**
39 * SnapManager 2d Snap Cache Info
40 */
41 isIn2DSnapCache : { value: false }, 32 isIn2DSnapCache : { value: false },
42 33
43 /**
44 * Color info
45 */
46 fill: { value: null }, 34 fill: { value: null },
47 stroke: { value: null }, 35 stroke: { value: null },
48 36
37 initialize: {
38 value: function(type, selection, controller, isShape) {
39 /*
40 this.type = type;
41 this.selection = selection;
42
43 controller: { value: ControllerFactory.getController(controller)},
44 pi: { value: pi},
45 props3D: { value: p3d},
46 shapeModel: { value: shapeProps},
47 isShape: { value: isShape}
48 */
49 }
50 },
51
49 getProperty: { 52 getProperty: {
50 value: function(property) { 53 value: function(property) {
51 var key = this.key + property; 54 var key = this.key + property;
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index c1270c3b..e571e505 100755
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
@@ -5,8 +5,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
5</copyright> */ 5</copyright> */
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("montage/ui/component").Component;
9 NJUtils = require("js/lib/NJUtils").NJUtils;
10 9
11exports.Properties3D = Montage.create(Component, { 10exports.Properties3D = Montage.create(Component, {
12 11