aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-17 11:08:53 -0700
committerValerio Virgillito2012-04-17 11:08:53 -0700
commitcacb4a21825818af392c2949967b0f3c1df509c5 (patch)
tree41d4fbfd5f159f2e605f591dbd5c2ad90008505d
parentebd9ba757657c159bbed19193f4ff0fd0f57e420 (diff)
parent7372dd9aa32e404b971efb78c354a9cdfc86c212 (diff)
downloadninja-cacb4a21825818af392c2949967b0f3c1df509c5.tar.gz
Merge pull request #165 from mqg734/BoundsCalculation
Drag and drop of images and components should not add 3d values by default
-rwxr-xr-xjs/mediators/drag-drop-mediator.js4
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js4
2 files changed, 2 insertions, 6 deletions
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 9d1b69a9..eedab8fc 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -130,9 +130,7 @@ exports.DragDropMediator = Montage.create(Component, {
130 rules = { 130 rules = {
131 'position': 'absolute', 131 'position': 'absolute',
132 'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px', 132 'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px',
133 'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px', 133 'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px'
134 '-webkit-transform-style' : 'preserve-3d',
135 '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
136 }; 134 };
137 // 135 //
138 self.application.ninja.elementMediator.addElements(element, rules); 136 self.application.ninja.elementMediator.addElements(element, rules);
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index acbf702f..cfacd461 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -286,9 +286,7 @@ exports.ComponentsPanel = Montage.create(Component, {
286 var styles = { 286 var styles = {
287 'position': 'absolute', 287 'position': 'absolute',
288 'left' : that.dragPosition[0] + 'px', 288 'left' : that.dragPosition[0] + 'px',
289 'top' : that.dragPosition[1] + 'px', 289 'top' : that.dragPosition[1] + 'px'
290 '-webkit-transform-style' : 'preserve-3d',
291 '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
292 }; 290 };
293 291
294 var defaultStyles = component.defaultStyles; 292 var defaultStyles = component.defaultStyles;