Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 39 insertions, 31 deletions

diff --git a/node_modules/montage-google/map.reel/map.js b/node_modules/montage-google/map.reel/map.js
index 3ba7fff7..fc104df5 100644
--- a/node_modules/montage-google/map.reel/map.js
+++ b/node_modules/montage-google/map.reel/map.js
@@ -28,12 +28,12 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             };
         }
     },
-    
-    _geoCoder: {value: null}, 
-    
+
+    _geoCoder: {value: null},
+
     // HTMLElement to load the Map into
     mapEl: {value: null},
-    
+
     _mapLoaded: {
         enumerable: false,
         value: false
@@ -42,14 +42,14 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
         enumerable: false,
         value: false
     },
-   
+
     // Sunnyvale, CA
     defaultLatLng: {
         value: {lat: 37.37, lng: -122.03}
     },
 
     _latLng: {
-        value: this.defaultLatLng, 
+        value: this.defaultLatLng,
         distinct: true
     },
     latLng: {
@@ -75,7 +75,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                 var self = this, geocoder = this._geoCoder;
                 this._center = value;
                 if(this._mapLoaded) {
-                    
+
                     if(String.isString(value)) {
                         // geocode
                         geocoder.geocode( { 'address': value}, function(results, status) {
@@ -92,9 +92,9 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                          // default location
                          this.latLng = this.defaultLatLng;
                     }
-                    
+
                 }
-                
+
             }
 
         }
@@ -113,7 +113,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             }
         }
     },
-    
+
     trafficLayer: {value: null},
     _traffic: {value: null},
     traffic: {
@@ -127,12 +127,12 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             }
         }
     },
-    
-    
+
+
     zoomValue: {
         value: 8
     },
-    
+
     __places: {value: null},
     _places: {
         get: function() {
@@ -145,11 +145,11 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             }
         }
     },
-    
+
     _getPlaces: {
         value: function(type, keyword) {
             var self = this;
-            var request = {                
+            var request = {
                 location: new window.google.maps.LatLng(this.latLng.lat, this.latLng.lng),
                 radius: 5000,
                 types: [type]
@@ -168,7 +168,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             });
         }
     },
-    
+
     _infoWindow: {value: null},
     _markers: {value: null},
     _createMarker: {
@@ -192,20 +192,20 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                 icon = '41-picture-frame.png';
                 break;
                 case 'gas_station':
-                icon = '47-fuel.png';                
+                icon = '47-fuel.png';
                 break;
             };
             if(icon) {
                 image = new google.maps.MarkerImage('images/' + icon);
-            }            
+            }
             var options = {
                 map: map,
                 position: place.geometry.location
             };
             if(image) {
                 options.icon = image;
-            }       
-            
+            }
+
             var marker = new google.maps.Marker(options);
             if(!this._markers) {
                 this._markers = [];
@@ -219,7 +219,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             });
         }
     },
-    
+
     _removeAllMarkers: {
         value: function() {
             if(this._markers && this._markers.length > 0) {
@@ -231,7 +231,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             }
         }
     },
-    
+
 
 /**
     Description TODO
@@ -240,11 +240,11 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
     draw: {
         enumerable: false,
         value: function () {
-            
+
             if(this._mapLoaded) {
                 var latLng = this.latLng || this.defaultLatLng;
                 if(!this._map) {
-                    var map;                            
+                    var map;
                     var myOptions = {
                         zoom: this.zoomValue,
                         center: new window.google.maps.LatLng(latLng.lat, latLng.lng),
@@ -258,9 +258,9 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                       var latLng = new window.google.maps.LatLng(latLng.lat, latLng.lng);
                       map.setCenter(latLng);
                       var marker = new google.maps.Marker({
-                          map: map, 
+                          map: map,
                           position: latLng
-                      });  
+                      });
 
                       var places = this._places;
                       if(places && places.length > 0) {
@@ -269,8 +269,8 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                           for (var i = 0; i < places.length; i++) {
                               this._createMarker(places[i]);
                           }
-                      } 
-                      
+                      }
+
                       if(this.traffic === true) {