You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/12/18 22:48:34 UTC
git commit: [flex-asjs] [refs/heads/develop] - Better integration of
JS and AS sides for GoogleMaps lib.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 534a6900b -> 139b9e180
Better integration of JS and AS sides for GoogleMaps lib.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/139b9e18
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/139b9e18
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/139b9e18
Branch: refs/heads/develop
Commit: 139b9e18039964c779552826601434c72c218ed9
Parents: 534a690
Author: Peter Ent <pe...@apache.org>
Authored: Fri Dec 18 16:48:30 2015 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Dec 18 16:48:30 2015 -0500
----------------------------------------------------------------------
.../org/apache/flex/maps/google/GoogleMap.as | 2 --
.../flex/maps/google/beads/GoogleMapView.as | 24 +++++++++-----------
.../apache/flex/maps/google/models/MapModel.as | 13 ++---------
3 files changed, 13 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/139b9e18/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as
index 9265692..26da707 100644
--- a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as
+++ b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as
@@ -74,7 +74,6 @@ package org.apache.flex.maps.google
MapModel(model).token = value;
}
- COMPILE::JS
public function get selectedMarker():Marker
{
return MapModel(model).selectedMarker;
@@ -100,7 +99,6 @@ package org.apache.flex.maps.google
GoogleMapView(view).centerOnAddress(address);
}
- COMPILE::JS
public function setCenter(location:LatLng):void
{
GoogleMapView(view).setCenter(location);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/139b9e18/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as
index 71a6c3a..e705f80 100644
--- a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as
+++ b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as
@@ -36,19 +36,19 @@ package org.apache.flex.maps.google.beads
COMPILE::JS {
import goog.bind;
-
- import google.maps.event;
- import google.maps.Geocoder;
- import google.maps.GeocoderResult;
- import google.maps.GeocoderStatus;
- import google.maps.LatLng;
- import google.maps.Map;
- import google.maps.Marker;
- import google.maps.places.PlaceResult;
- import google.maps.places.PlacesService;
- import google.maps.places.PlacesServiceStatus;
}
+ import google.maps.event;
+ import google.maps.Geocoder;
+ import google.maps.GeocoderResult;
+ import google.maps.GeocoderStatus;
+ import google.maps.LatLng;
+ import google.maps.Map;
+ import google.maps.Marker;
+ import google.maps.places.PlaceResult;
+ import google.maps.places.PlacesService;
+ import google.maps.places.PlacesServiceStatus;
+
/**
* The MapView bead class displays a Google Map using HTMLLoader.
*
@@ -510,7 +510,6 @@ package org.apache.flex.maps.google.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::JS
public function createMarker(location:LatLng):Marker
{
return null;
@@ -550,7 +549,6 @@ package org.apache.flex.maps.google.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::JS
public function setCenter( location:LatLng ):void
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/139b9e18/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as
index 3f412c6..6184143 100644
--- a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as
+++ b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as
@@ -23,11 +23,8 @@ package org.apache.flex.maps.google.models
import org.apache.flex.events.Event;
import org.apache.flex.events.EventDispatcher;
- COMPILE::JS
- {
- import google.maps.LatLng;
- import google.maps.Marker;
- }
+ import google.maps.LatLng;
+ import google.maps.Marker;
/**
* The data model for the Map class, this holds the maps current center
@@ -81,7 +78,6 @@ package org.apache.flex.maps.google.models
dispatchEvent(new Event("tokenChanged"));
}
- COMPILE::JS
private var _currentCenter:LatLng;
/**
@@ -92,20 +88,17 @@ package org.apache.flex.maps.google.models
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::JS
public function get currentCenter():LatLng
{
return _currentCenter;
}
- COMPILE::JS
public function set currentCenter(value:LatLng):void
{
_currentCenter = value;
dispatchEvent( new Event("currentCenterChanged") );
}
- COMPILE::JS
private var _selectedMarker:Marker;
/**
@@ -116,13 +109,11 @@ package org.apache.flex.maps.google.models
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::JS
public function get selectedMarker():Marker
{
return _selectedMarker;
}
- COMPILE::JS
public function set selectedMarker(value:Marker):void
{
_selectedMarker = value;