Merge pull request #71 from NativeScript/hdeshev/page-provider-fix

Fix page DI provider

Author: hdeshev

ng-sample/app/app.ts

@@ -13,17 +13,17 @@ import trace = require("trace");
 trace.setCategories(routerTraceCategory);
 trace.enable();
 
-//import {RendererTest} from './examples/renderer-test';
-//import {Benchmark} from './performance/benchmark';
-//import {ListTest} from './examples/list/list-test';
-// import {ListTestAsync} from "./examples/list/list-test-async";
-// import {ImageTest} from "./examples/image/image-test";
+import {RendererTest} from './examples/renderer-test';
+import {Benchmark} from './performance/benchmark';
+import {ListTest} from './examples/list/list-test';
+import {ListTestAsync} from "./examples/list/list-test-async";
+import {ImageTest} from "./examples/image/image-test";
 import {NavigationTest} from "./examples/navigation/navigation-test";
 
 
-//nativeScriptBootstrap(RendererTest);
+nativeScriptBootstrap(RendererTest);
 //nativeScriptBootstrap(Benchmark);
 //nativeScriptBootstrap(ListTest);
 // nativeScriptBootstrap(ListTestAsync);
 // nativeScriptBootstrap(ImageTest);
-nativeScriptBootstrap(NavigationTest, [NS_ROUTER_PROVIDERS]);
+//nativeScriptBootstrap(NavigationTest, [NS_ROUTER_PROVIDERS]);

ng-sample/hooks/before-prepare/30-remove-stale-widgets-jar.js

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-angular",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "",
   "homepage": "http://www.telerik.com",
   "bugs": "http://www.telerik.com",

package.json

@@ -34,7 +34,7 @@ export type ProviderArray = Array<Type | Provider | any[]>;
 let _platform = null;
 
 export function bootstrap(appComponentType: any,
-                          customProviders: ProviderArray = null, page?: Page) : Promise<ComponentRef> {
+                          customProviders: ProviderArray = null) : Promise<ComponentRef> {
     NativeScriptDomAdapter.makeCurrent();
 
     let nativeScriptProviders: ProviderArray = [
@@ -60,7 +60,7 @@ export function bootstrap(appComponentType: any,
         appProviders.push(customProviders);
     }
 
-    const pageProvider = provide(Page, {useFactory: () => page || getDefaultPage()});
+    const pageProvider = provide(Page, {useFactory: getDefaultPage});
     appProviders.push(pageProvider);
 
     if (!_platform) {
@@ -93,7 +93,7 @@ export function nativeScriptBootstrap(appComponentType: any, customProviders?: P
 
                 //profiling.start('ng-bootstrap');
                 console.log('BOOTSTRAPPING...');
-                bootstrap(appComponentType, customProviders, page).then((appRef) => {
+                bootstrap(appComponentType, customProviders).then((appRef) => {
                     //profiling.stop('ng-bootstrap');
                     console.log('ANGULAR BOOTSTRAP DONE.');
                 }, (err) =>{