diff options
author | Valerio Virgillito | 2012-03-17 18:41:17 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-17 18:41:17 -0700 |
commit | a086ca62423a09807e2f3a79107249bc31d5e908 (patch) | |
tree | 14485545ff242d341cdf3fe0c46340427fb7bf14 | |
parent | 3070d7b2a3b96609eace60825c721951c85405cc (diff) | |
download | ninja-a086ca62423a09807e2f3a79107249bc31d5e908.tar.gz |
Adding back webkit-transform styles in set3DProperties. Changing "zoom" to "zoomValue" in map component to avoid scaling the map.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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.js | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index efaa00ee..70aba54e 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.js b/node_modules/montage/ui/map.reel/map.js index 1e4f452c..c03d51c5 100644 --- a/node_modules/montage/ui/map.reel/map.js +++ b/node_modules/montage/ui/map.reel/map.js | |||
@@ -140,7 +140,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ | |||
140 | } | 140 | } |
141 | }, | 141 | }, |
142 | 142 | ||
143 | zoom: { | 143 | zoomValue: { |
144 | value: 8 | 144 | value: 8 |
145 | }, | 145 | }, |
146 | 146 | ||
@@ -250,7 +250,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ | |||
250 | if(!this._map) { | 250 | if(!this._map) { |
251 | var map; | 251 | var map; |
252 | var myOptions = { | 252 | var myOptions = { |
253 | zoom: this.zoom, | 253 | zoom: this.zoomValue, |
254 | center: new window.google.maps.LatLng(latLng.lat, latLng.lng), | 254 | center: new window.google.maps.LatLng(latLng.lat, latLng.lng), |
255 | mapTypeId: window.google.maps.MapTypeId.ROADMAP | 255 | mapTypeId: window.google.maps.MapTypeId.ROADMAP |
256 | }; | 256 | }; |