Merge pull request #65 from NativeScript/hdeshev/multiple-bootstraps

No more multiple platform bootstraps

Author: hdeshev

ng-sample/sync-android.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+APPNAME="$1" # e.g. org.nativescript.myapp
+APPFOLDER="data/data/$APPNAME/files/app"
+NSACTIVITY="com.tns.NativeScriptActivity"
+
+cd app
+for file_match in "*.js" "*.xml" "*.css"; do
+    find . -iname "$file_match" -print0 | \
+        xargs -0 -I FILEPATH -P 16 adb push "FILEPATH" "$APPFOLDER/FILEPATH" \;
+done
+
+adb shell am force-stop "$APPNAME"
+adb shell am start -a android.intent.action.MAIN -n "$APPNAME/$NSACTIVITY"

ng-sample/tsconfig.json

@@ -19,12 +19,10 @@
         "app/nativescript-angular/dom_adapter.ts",
         "app/nativescript-angular/text-value-accessor.ts",
         "app/nativescript-angular/element-registry.d.ts",
-        "app/nativescript-angular/zone.ts",
         "app/nativescript-angular/application.d.ts",
         "app/nativescript-angular/renderer.ts",
         "app/nativescript-angular/element-registry.ts",
         "app/nativescript-angular/xhr.ts",
-        "app/nativescript-angular/zone_patch.ts",
         "app/nativescript-angular/directives/ns-directives.ts",
         "app/nativescript-angular/directives/tab-view.ts",
         "app/nativescript-angular/directives/list-view.ts",
@@ -46,4 +44,4 @@
         "node_modules",
         "platforms"
     ]
-}
+}

src/nativescript-angular/application.ts

@@ -31,6 +31,8 @@ import application = require('application');
 
 export type ProviderArray = Array<Type | Provider | any[]>;
 
+let _platform = null;
+
 export function bootstrap(appComponentType: any,
                           customProviders: ProviderArray = null) : Promise<ComponentRef> {
     NativeScriptDomAdapter.makeCurrent();
@@ -58,7 +60,10 @@ export function bootstrap(appComponentType: any,
         appProviders.push(customProviders);
     }
 
-    return platform(nativeScriptProviders).application(appProviders).bootstrap(appComponentType);
+    if (!_platform) {
+        _platform = platform(nativeScriptProviders);
+    }
+    return _platform.application(appProviders).bootstrap(appComponentType);
 }
 
 export function nativeScriptBootstrap(appComponentType: any, customProviders?: ProviderArray, appOptions?: any) {