Skip to content

Commit

Permalink
feat(*): Support for RC6
Browse files Browse the repository at this point in the history
Closes #604
  • Loading branch information
timwright35 authored and sebholstein committed Sep 2, 2016
1 parent dba6a36 commit 824e15a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
30 changes: 14 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@
},
"homepage": "https://github.com/SebastianM/angular2-google-maps#readme",
"dependencies": {
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12"
"@angular/common": "2.0.0-rc.6",
"@angular/compiler": "2.0.0-rc.6",
"@angular/core": "2.0.0-rc.6",
"@angular/platform-browser": "2.0.0-rc.6",
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
"rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17"
},
"devDependencies": {
"babel-eslint": "6.0.4",
Expand Down Expand Up @@ -71,14 +70,13 @@
"jspm": {
"jspmNodeConversion": false,
"dependencies": {
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12"
"@angular/common": "2.0.0-rc.6",
"@angular/compiler": "2.0.0-rc.6",
"@angular/core": "2.0.0-rc.6",
"@angular/platform-browser": "2.0.0-rc.6",
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
"rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17"
}
}
}
3 changes: 2 additions & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default {
'rxjs/Subject': 'Rx',
'rxjs/observable/PromiseObservable': 'Rx',
'rxjs/operator/toPromise': 'Rx.Observable.prototype',
'rxjs/Observable': 'Rx'
'rxjs/Observable': 'Rx',
'rxjs/Rx': 'Rx'
}
}
4 changes: 2 additions & 2 deletions src/core/core-module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ModuleWithProviders, NgModule, Provider, provide} from '@angular/core';
import {ModuleWithProviders, NgModule, Provider} from '@angular/core';

import {SebmGoogleMap} from './directives/google-map';
import {SebmGoogleMapCircle} from './directives/google-map-circle';
Expand Down Expand Up @@ -27,7 +27,7 @@ export class AgmCoreModule {
*/
static forRoot(lazyMapsAPILoaderConfig?: LazyMapsAPILoaderConfigLiteral): ModuleWithProviders {
const providers: Provider[] =
[...BROWSER_GLOBALS_PROVIDERS, provide(MapsAPILoader, {useClass: LazyMapsAPILoader})];
[...BROWSER_GLOBALS_PROVIDERS, {provide: MapsAPILoader, useClass: LazyMapsAPILoader}];
if (lazyMapsAPILoaderConfig) {
providers.push(provideLazyMapsAPILoaderConfig(lazyMapsAPILoaderConfig));
}
Expand Down
7 changes: 4 additions & 3 deletions src/core/services/maps-api-loader/lazy-maps-api-loader.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Inject, Injectable, Optional, Provider, provide} from '@angular/core';
import {Inject, Injectable, Optional, Provider} from '@angular/core';

import {DOCUMENT_GLOBAL, WINDOW_GLOBAL} from '../../utils/browser-globals';

Expand Down Expand Up @@ -183,7 +183,8 @@ export class LazyMapsAPILoader extends MapsAPILoader {
*/
export function provideLazyMapsAPILoaderConfig(confLiteral: LazyMapsAPILoaderConfigLiteral):
Provider {
return provide(LazyMapsAPILoaderConfig, {
return {
provide: LazyMapsAPILoaderConfig,
useFactory: () => {
const config = new LazyMapsAPILoaderConfig();
// todo(sebastian): deprecate LazyMapsAPILoader class
Expand All @@ -198,5 +199,5 @@ export function provideLazyMapsAPILoaderConfig(confLiteral: LazyMapsAPILoaderCon
config.region = config.region || DEFAULT_CONFIGURATION.region;
return config;
}
});
};
}
4 changes: 2 additions & 2 deletions src/core/utils/browser-globals.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {OpaqueToken, Provider, provide} from '@angular/core';
import {OpaqueToken, Provider} from '@angular/core';

export const WINDOW_GLOBAL = new OpaqueToken('angular2-google-maps window_global');
export const DOCUMENT_GLOBAL = new OpaqueToken('angular2-google-maps document_global');

export const BROWSER_GLOBALS_PROVIDERS: Provider[] =
[provide(WINDOW_GLOBAL, {useValue: window}), provide(DOCUMENT_GLOBAL, {useValue: document})];
[{provide: WINDOW_GLOBAL, useValue: window}, {provide: DOCUMENT_GLOBAL, useValue: document}];

0 comments on commit 824e15a

Please sign in to comment.