diff options
| author | Valerio Virgillito | 2012-03-17 16:42:13 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-17 16:42:13 -0700 |
| commit | bcddcf118d4ce93e8a2519ed455c6e25a701ce74 (patch) | |
| tree | 6a9258df557c6e13406dd96b26bbd1fef12e9c16 | |
| parent | 11afad994a9ff5e3c8c43d8ad9cd2cf7d0147797 (diff) | |
| download | ninja-bcddcf118d4ce93e8a2519ed455c6e25a701ce74.tar.gz | |
fixing the map styles and temporary disabling the 3d styles for elements.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| -rwxr-xr-x | js/controllers/elements/element-controller.js | 8 | ||||
| -rw-r--r-- | node_modules/montage/ui/map.reel/map.html | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 70aba54e..efaa00ee 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
| @@ -290,10 +290,10 @@ var ElementController = exports.ElementController = Montage.create(NJComponent, | |||
| 290 | value: function(el, props, index, update3DModel) { | 290 | value: function(el, props, index, update3DModel) { |
| 291 | var dist = props[index]["dist"], | 291 | var dist = props[index]["dist"], |
| 292 | mat = props[index]["mat"]; | 292 | mat = props[index]["mat"]; |
| 293 | this.application.ninja.stylesController.setElementStyle(el, | 293 | // this.application.ninja.stylesController.setElementStyle(el, |
| 294 | "-webkit-transform", | 294 | // "-webkit-transform", |
| 295 | "perspective(" + dist + ") " + | 295 | // "perspective(" + dist + ") " + |
| 296 | "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); | 296 | // "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); |
| 297 | 297 | ||
| 298 | el.elementModel.props3D.matrix3d = mat; | 298 | el.elementModel.props3D.matrix3d = mat; |
| 299 | el.elementModel.props3D.perspectiveDist = dist; | 299 | el.elementModel.props3D.perspectiveDist = dist; |
diff --git a/node_modules/montage/ui/map.reel/map.html b/node_modules/montage/ui/map.reel/map.html index a6ac5303..5cd3a5b5 100644 --- a/node_modules/montage/ui/map.reel/map.html +++ b/node_modules/montage/ui/map.reel/map.html | |||
| @@ -35,6 +35,17 @@ | |||
| 35 | } | 35 | } |
| 36 | </script> | 36 | </script> |
| 37 | 37 | ||
| 38 | <style> | ||
| 39 | |||
| 40 | .montage-google-map { | ||
| 41 | margin: 0; | ||
| 42 | padding: 0; | ||
| 43 | width: 600px; | ||
| 44 | height: 700px; | ||
| 45 | } | ||
| 46 | |||
| 47 | </style> | ||
| 48 | |||
| 38 | </head> | 49 | </head> |
| 39 | <body> | 50 | <body> |
| 40 | 51 | ||