aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/element-controller.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-02 16:28:39 -0700
committerJohn Mayhew2012-04-02 16:28:39 -0700
commitb4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/controllers/elements/element-controller.js
parent5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-xjs/controllers/elements/element-controller.js65
1 files changed, 22 insertions, 43 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index ec0335b4..b35251ad 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -51,31 +51,15 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
51 51
52 setAttribute: { 52 setAttribute: {
53 value: function(el, att, value) { 53 value: function(el, att, value) {
54 if(att === "id") {
55 if(value === "") {
56 el.setAttribute(att, value);
57 return;
58 }
59
60 // Then check if this is a valid id by the following spec: http://www.w3.org/TR/REC-html40/types.html#h-6.2
61 var regexID = /^([a-zA-Z])+([a-zA-Z0-9_\.\:\-])+/;
62 if(!regexID.test(value)) {
63 alert("Invalid ID");
64 return;
65 } else if (this.application.ninja.currentDocument._document.getElementById(value) !== null) {
66 alert("The following ID: " + value + " is already in Use");
67 }
68
69 }
70
71 el.setAttribute(att, value); 54 el.setAttribute(att, value);
72 } 55 }
73 }, 56 },
74 57
75 //-------------------------------------------------------------------------------------------------------- 58 //--------------------------------------------------------------------------------------------------------
76 // Routines to get/set color properties 59 // Routines to get/set color properties
60 // borderSide : "top", "right", "bottom", or "left"
77 getColor: { 61 getColor: {
78 value: function(el, isFill) { 62 value: function(el, isFill, borderSide) {
79 var colorObj, 63 var colorObj,
80 color, 64 color,
81 image; 65 image;
@@ -87,22 +71,29 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
87 { 71 {
88 return el.elementModel.fill; 72 return el.elementModel.fill;
89 } 73 }
90// return this.application.ninja.stylesController.getElementStyle(el, "background-color");
91 //TODO: Once logic for color and gradient is established, this needs to be revised 74 //TODO: Once logic for color and gradient is established, this needs to be revised
92 color = this.getProperty(el, "background-color"); 75 color = this.getProperty(el, "background-color");
93 image = this.getProperty(el, "background-image"); 76 image = this.getProperty(el, "background-image");
94 } 77 }
95 else 78 else
96 { 79 {
97 // TODO - Need to figure out which border side user wants 80 // Try getting border color from specific side first
98 if(el.elementModel.stroke) 81 if(borderSide)
99 { 82 {
100 return el.elementModel.stroke; 83 color = this.getProperty(el, "border-" + borderSide + "-color");
84 image = this.getProperty(el, "border-" + borderSide + "-image");
85 }
86
87 // If no color was found, look up the shared border color
88 if(!color && !image)
89 {
90 if(el.elementModel.stroke)
91 {
92 return el.elementModel.stroke;
93 }
94 color = this.getProperty(el, "border-color");
95 image = this.getProperty(el, "border-image");
101 } 96 }
102 // TODO - Need to figure out which border side user wants
103// return this.application.ninja.stylesController.getElementStyle(el, "border-color");
104 color = this.getProperty(el, "border-color");
105 image = this.getProperty(el, "border-image");
106 } 97 }
107 98
108 if(color || image) { 99 if(color || image) {
@@ -120,11 +111,15 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
120 { 111 {
121 el.elementModel.fill = colorObj; 112 el.elementModel.fill = colorObj;
122 } 113 }
123 else 114 else if(!borderSide)
124 { 115 {
125 // TODO - Need to update border style and width also 116 // TODO - Need to update border style and width also
126 el.elementModel.stroke = colorObj; 117 el.elementModel.stroke = colorObj;
127 } 118 }
119 else
120 {
121 // TODO - Should update specific border sides too
122 }
128 123
129 return colorObj; 124 return colorObj;
130 } 125 }
@@ -233,22 +228,6 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
233 mat = this.transformStringToMat( xformStr ); 228 mat = this.transformStringToMat( xformStr );
234 if (!mat) 229 if (!mat)
235 mat = Matrix.I(4); 230 mat = Matrix.I(4);
236
237 var zoom = this.application.ninja.elementMediator.getProperty(el, "zoom");
238 if (zoom)
239 {
240 zoom = Number(zoom);
241 if (zoom != 1)
242 {
243 var zoomMat = Matrix.create( [
244 [ zoom, 0, 0, 0],
245 [ 0, zoom, 0, 0],
246 [ 0, 0, zoom, 0],
247 [ 0, 0, 0, 1]
248 ] );
249 glmat4.multiply( zoomMat, mat, mat );
250 }
251 }
252 } 231 }
253 232
254 el.elementModel.props3D.matrix3d = mat; 233 el.elementModel.props3D.matrix3d = mat;