diff options
| author | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
| commit | df903a01e14134cadf109b733d09c6eadfa3966b (patch) | |
| tree | 2351f1c05b2f852053fa0be533072088a9ad4e7c /js/mediators/drag-drop-mediator.js | |
| parent | 036cf034e124dbc1f4893e90f7c6d240904a3faf (diff) | |
| parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
| download | ninja-df903a01e14134cadf109b733d09c6eadfa3966b.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/mediators/drag-drop-mediator.js')
| -rwxr-xr-x | js/mediators/drag-drop-mediator.js | 4 |
1 files changed, 1 insertions, 3 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); |