From da16c1a20f31a16f2e585226de56bcb54589f089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Thu, 17 Dec 2015 19:14:56 +0100 Subject: [PATCH] feat(angular2): support 2.0.0-beta.0 --- package.json | 2 +- src/angular2_google_maps.ts | 2 +- src/directives/google_map.ts | 2 +- src/directives/google_map_marker.ts | 2 +- src/services/google_maps_api_wrapper.ts | 3 ++- src/services/maps_api_loader/lazy_maps_api_loader.ts | 2 +- src/services/maps_api_loader/maps_api_loader.ts | 2 +- src/services/marker_manager.ts | 3 ++- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 0cd09b37b..c423849a6 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "homepage": "https://github.com/SebastianM/angular2-google-maps#readme", "dependencies": { - "angular2": "^2.0.0-alpha.52", + "angular2": "^2.0.0-beta.0", "es6-promise": "^3.0.2", "es6-shim": "^0.33.3", "reflect-metadata": "0.1.2", diff --git a/src/angular2_google_maps.ts b/src/angular2_google_maps.ts index 5e4ad3999..4fb727bbf 100644 --- a/src/angular2_google_maps.ts +++ b/src/angular2_google_maps.ts @@ -1,4 +1,4 @@ -import {Provider} from 'angular2/angular2'; +import {Provider} from 'angular2/core'; import {MapsAPILoader} from './services/maps_api_loader/maps_api_loader'; import {LazyMapsAPILoader} from './services/maps_api_loader/lazy_maps_api_loader'; diff --git a/src/directives/google_map.ts b/src/directives/google_map.ts index c9777034b..7fef97ed8 100644 --- a/src/directives/google_map.ts +++ b/src/directives/google_map.ts @@ -1,4 +1,4 @@ -import {Component, Input, Renderer, ElementRef, NgZone} from 'angular2/angular2'; +import {Component, Input, Renderer, ElementRef, NgZone} from 'angular2/core'; import {GoogleMapsAPIWrapper} from '../services/google_maps_api_wrapper'; import {MarkerManager} from '../services/marker_manager'; diff --git a/src/directives/google_map_marker.ts b/src/directives/google_map_marker.ts index 30b555ebe..b4b556c9f 100644 --- a/src/directives/google_map_marker.ts +++ b/src/directives/google_map_marker.ts @@ -6,7 +6,7 @@ import { OnChanges, EventEmitter, Output -} from 'angular2/angular2'; +} from 'angular2/core'; import {MarkerManager} from '../services/marker_manager'; let markerId = 0; diff --git a/src/services/google_maps_api_wrapper.ts b/src/services/google_maps_api_wrapper.ts index a9ee50e05..dd8586659 100644 --- a/src/services/google_maps_api_wrapper.ts +++ b/src/services/google_maps_api_wrapper.ts @@ -1,5 +1,6 @@ -import {Injectable, Observable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {Observer} from 'rxjs/Observer'; +import {Observable} from 'rxjs/Observable'; import {MapsAPILoader} from './maps_api_loader/maps_api_loader'; diff --git a/src/services/maps_api_loader/lazy_maps_api_loader.ts b/src/services/maps_api_loader/lazy_maps_api_loader.ts index 1d80a7a57..90df5d364 100644 --- a/src/services/maps_api_loader/lazy_maps_api_loader.ts +++ b/src/services/maps_api_loader/lazy_maps_api_loader.ts @@ -1,4 +1,4 @@ -import {Injectable, Optional} from 'angular2/angular2'; +import {Injectable, Optional} from 'angular2/core'; import {MapsAPILoader} from './maps_api_loader'; export enum GoogleMapsScriptProtocol { diff --git a/src/services/maps_api_loader/maps_api_loader.ts b/src/services/maps_api_loader/maps_api_loader.ts index a5dedb4eb..bd20afe3d 100644 --- a/src/services/maps_api_loader/maps_api_loader.ts +++ b/src/services/maps_api_loader/maps_api_loader.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; @Injectable() export abstract class MapsAPILoader { diff --git a/src/services/marker_manager.ts b/src/services/marker_manager.ts index b85d91e16..34c51fb96 100644 --- a/src/services/marker_manager.ts +++ b/src/services/marker_manager.ts @@ -1,5 +1,6 @@ -import {Injectable, Observable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {Observer} from 'rxjs/Observer'; +import {Observable} from 'rxjs/Observable'; import {SebmGoogleMapMarker} from '../directives/google_map_marker'; import {GoogleMapsAPIWrapper} from './google_maps_api_wrapper';