From bcef348d00172911d27866a89c4bcf5e977136fc Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Tue, 16 Feb 2016 16:59:15 +0200 Subject: [PATCH 1/4] Bump version to 0.0.30 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b796ee07c..8d012491a 100644 --- a/package.json +++ b/package.json @@ -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", From 76772cbc23d9339a883ea6c9df8c28f6cd9559f5 Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Wed, 17 Feb 2016 11:15:35 +0200 Subject: [PATCH 2/4] Fix Page DI provider to always return the current page. --- src/nativescript-angular/application.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nativescript-angular/application.ts b/src/nativescript-angular/application.ts index 012a20ade..d61635f23 100644 --- a/src/nativescript-angular/application.ts +++ b/src/nativescript-angular/application.ts @@ -34,7 +34,7 @@ export type ProviderArray = Array; let _platform = null; export function bootstrap(appComponentType: any, - customProviders: ProviderArray = null, page?: Page) : Promise { + customProviders: ProviderArray = null) : Promise { 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) =>{ From 1caad2b058073a4fe9ba1615c13bbdf272e9927f Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Wed, 17 Feb 2016 11:15:46 +0200 Subject: [PATCH 3/4] Delete an unneeded hook --- .../30-remove-stale-widgets-jar.js | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 ng-sample/hooks/before-prepare/30-remove-stale-widgets-jar.js diff --git a/ng-sample/hooks/before-prepare/30-remove-stale-widgets-jar.js b/ng-sample/hooks/before-prepare/30-remove-stale-widgets-jar.js deleted file mode 100644 index 14b6da1ab..000000000 --- a/ng-sample/hooks/before-prepare/30-remove-stale-widgets-jar.js +++ /dev/null @@ -1,16 +0,0 @@ -var path = require('path'); -var shelljs = require('shelljs'); - -module.exports = function ($logger, $projectData, $usbLiveSyncService) { - if (!$usbLiveSyncService.isInitialized) { - // Delete stale widgets.jar brought by old Android platforms. - // TODO: Remove this after version 1.6.0 of the Android runtime gets released - var jars = shelljs.find('platforms/android').filter(function(fileName){ - return fileName.match(/widgets.jar$/); - }); - jars.forEach(function(jarFile) { - console.log('Deleting stale jar file: ' + jarFile); - shelljs.rm(jarFile); - }); - } -}; From a06ace784ff8f948066f192233a3cf2cf6172d13 Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Wed, 17 Feb 2016 11:19:31 +0200 Subject: [PATCH 4/4] Switch app back to RendererTest --- ng-sample/app/app.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts index ad35174c2..b8247209f 100644 --- a/ng-sample/app/app.ts +++ b/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]);