aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-01 16:54:27 -0800
committerValerio Virgillito2012-03-01 16:56:29 -0800
commitf404e2cbd9cf4086bfb8265a88ea4c1f0f0a289b (patch)
tree2825807849a2365ed798f8d8752ace84843810bb /js
parent0a500496236bedbdd9fbbcb3d841a195b3e5fc0f (diff)
downloadninja-f404e2cbd9cf4086bfb8265a88ea4c1f0f0a289b.tar.gz
revert removing the webkit transform from elements.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/mediators/element-mediator.js9
-rwxr-xr-xjs/tools/TagTool.js10
2 files changed, 9 insertions, 10 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 60a75992..127f73e1 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -90,11 +90,10 @@ exports.ElementMediator = Montage.create(NJComponent, {
90 _addElement: { 90 _addElement: {
91 value: function(el, rules, noEvent) { 91 value: function(el, rules, noEvent) {
92 ElementController.addElement(el, rules); 92 ElementController.addElement(el, rules);
93 // Commenting this out because we should not add 3D properties by default when creating new elements. 93 var p3d = this.get3DProperties(el);
94// var p3d = this.get3DProperties(el); 94 if(p3d) {
95// if(p3d) { 95 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
96// el.elementModel.controller["set3DProperties"](el, [p3d], 0, true); 96 }
97// }
98 if(!noEvent) { 97 if(!noEvent) {
99 this.application.ninja.documentController.activeDocument.needsSave = true; 98 this.application.ninja.documentController.activeDocument.needsSave = true;
100 NJevent("elementAdded", el); 99 NJevent("elementAdded", el);
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 39667aa7..e3f49bbe 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -232,9 +232,9 @@ exports.TagTool = Montage.create(DrawingTool, {
232 styles = { 232 styles = {
233 'position': 'absolute', 233 'position': 'absolute',
234 'top' : top + 'px', 234 'top' : top + 'px',
235 'left' : left + 'px' 235 'left' : left + 'px',
236// '-webkit-transform-style' : 'preserve-3d', 236 '-webkit-transform-style' : 'preserve-3d',
237// '-webkit-transform' : matStr 237 '-webkit-transform' : matStr
238 }; 238 };
239 239
240 // TODO - for canvas, set both as style and attribute. 240 // TODO - for canvas, set both as style and attribute.
@@ -254,8 +254,8 @@ exports.TagTool = Montage.create(DrawingTool, {
254 makeStaticElement: { 254 makeStaticElement: {
255 value: function(tag) { 255 value: function(tag) {
256 var styles = { 256 var styles = {
257// "-webkit-transform-style": "preserve-3d", 257 "-webkit-transform-style": "preserve-3d",
258// "-webkit-transform": "perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)" 258 "-webkit-transform": "perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)"
259 }; 259 };
260 tag.innerHTML = "content"; 260 tag.innerHTML = "content";
261 261