Merge pull request #63 from NativeScript/hdeshev/beta-3

Upgrade to beta 3

Author: hdeshev

ng-sample/gruntfile.js

@@ -23,15 +23,15 @@
   },
   "homepage": "https://github.com/NativeScript/template-hello-world",
   "dependencies": {
-    "tns-core-modules": "^1.6.0-angular-4",
-    "angular2": "2.0.0-beta.2",
+    "tns-core-modules": "^1.6.0-angular-5",
+    "angular2": "2.0.0-beta.3",
     "parse5": "1.4.2",
     "punycode": "1.3.2",
     "querystring": "0.2.0",
     "url": "0.10.3",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.0",
-    "zone.js": "0.5.10"
+    "zone.js": "0.5.11"
   },
   "devDependencies": {
     "grunt": "0.4.5",

ng-sample/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-angular",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "",
   "homepage": "http://www.telerik.com",
   "bugs": "http://www.telerik.com",
@@ -14,16 +14,16 @@
   },
   "scripts": {},
   "dependencies": {
-      "tns-core-modules": "^1.6.0-angular-4",
-      "angular2": "2.0.0-beta.2",
+      "tns-core-modules": "^1.6.0-angular-5",
+      "angular2": "2.0.0-beta.3",
       "es6-shim": "^0.33.3",
       "parse5": "1.4.2",
       "punycode": "1.3.2",
       "querystring": "0.2.0",
       "url": "0.10.3",
       "reflect-metadata": "0.1.2",
       "rxjs": "5.0.0-beta.0",
-      "zone.js": "0.5.10"
+      "zone.js": "0.5.11"
   },
   "devDependencies": {
     "grunt": "0.4.5",

package.json

@@ -1,3 +1,6 @@
+/// <reference path="../node_modules/angular2/typings/es6-shim/es6-shim.d.ts" />
+/// <reference path="../node_modules/angular2/typings/node/node.d.ts" />
+/// <reference path="../node_modules/tns-core-modules/tns-core-modules.base.d.ts" />
 declare var assert: any;
 
 interface Map<K, V> {

src/global.d.ts

@@ -1,12 +1,8 @@
+//Import globals before the zone, so the latter can patch the global functions
+import 'globals';
+import "zone.js/dist/zone.js"
 import 'reflect-metadata';
 import './polyfills/array';
-import 'globals';
-//HACK: Unhack our global lazy loaded functions hack to make zone monkey patching work.
-var __dummy_setTimeout = global.setTimeout;
-var __dummy_clearTimeout = global.clearTimeout;
-var __dummy_setInterval = global.setInterval;
-var __dummy_clearInterval = global.clearInterval;
-import './zone';
 import {isPresent, Type} from 'angular2/src/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {platform, ComponentRef, PLATFORM_DIRECTIVES, PLATFORM_PIPES} from 'angular2/core';

src/nativescript-angular/application.ts

@@ -2,7 +2,8 @@ import {Inject, Injectable} from 'angular2/src/core/di';
 import {
     Renderer,
     RootRenderer,
-    RenderComponentType
+    RenderComponentType,
+    RenderDebugInfo
 } from 'angular2/src/core/render/api';
 import {isBlank} from 'angular2/src/facade/lang';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
@@ -121,6 +122,11 @@ export class NativeScriptRenderer extends Renderer {
         console.log('NativeScriptRenderer.setBindingDebugInfo: ' + renderElement + ', ' + propertyName + ' = ' + propertyValue);
     }
 
+    setElementDebugInfo(renderElement: any, info: RenderDebugInfo): void {
+        console.log('NativeScriptRenderer.setElementDebugInfo: ' + renderElement);
+    }
+
+
     /**
     * Calls a method on an element.
     */

src/nativescript-angular/renderer.ts

@@ -1,55 +1,55 @@
 {
-	"nativescript": {
-		"id": "org.nativescript.helloworldng",
-		"tns-ios": {
-			"version": "1.5.2"
-		},
-		"tns-android": {
-			"version": "1.5.1"
-		}
-	},
-	"name": "nativescript-hello-world-ng",
-	"main": "app.js",
-	"version": "1.0.0",
-	"author": "Telerik <support@telerik.com>",
-	"description": "Nativescript Angular Hello World template",
-	"license": "BSD",
-	"keywords": [
-		"telerik",
-		"mobile",
-		"angular",
-		"nativescript",
-		"{N}",
-		"tns",
-		"appbuilder",
-		"template"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/NativeScript/template-hello-world-ng"
-	},
-	"homepage": "http://nativescript.org",
-	"dependencies": {
-		"angular2": "2.0.0-beta.2",
-		"nativescript-unit-test-runner": "^0.2.8",
-		"parse5": "1.4.2",
-		"punycode": "1.3.2",
-		"querystring": "0.2.0",
-		"reflect-metadata": "0.1.2",
-		"rxjs": "5.0.0-beta.0",
-		"tns-core-modules": "1.6.0-angular-4",
-		"url": "0.10.3",
-		"zone.js": "0.5.10"
-	},
-	"devDependencies": {
-		"chai": "^3.5.0",
-		"karma": "^0.13.19",
-		"karma-chai": "^0.1.0",
-		"karma-mocha": "^0.2.1",
-		"karma-nativescript-launcher": "^0.3.1",
-		"mocha": "^2.4.5",
-		"nativescript-dev-typescript": "^0.2.2",
-		"shelljs": "^0.5.3",
-		"typescript": "^1.7.5"
-	}
+  "nativescript": {
+    "id": "org.nativescript.helloworldng",
+    "tns-ios": {
+      "version": "1.5.2"
+    },
+    "tns-android": {
+      "version": "1.5.1"
+    }
+  },
+  "name": "nativescript-hello-world-ng",
+  "main": "app.js",
+  "version": "1.0.0",
+  "author": "Telerik <support@telerik.com>",
+  "description": "Nativescript Angular Hello World template",
+  "license": "BSD",
+  "keywords": [
+    "telerik",
+    "mobile",
+    "angular",
+    "nativescript",
+    "{N}",
+    "tns",
+    "appbuilder",
+    "template"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/NativeScript/template-hello-world-ng"
+  },
+  "homepage": "http://nativescript.org",
+  "dependencies": {
+    "angular2": "2.0.0-beta.3",
+    "nativescript-unit-test-runner": "^0.2.8",
+    "parse5": "1.4.2",
+    "punycode": "1.3.2",
+    "querystring": "0.2.0",
+    "reflect-metadata": "0.1.2",
+    "rxjs": "5.0.0-beta.0",
+    "tns-core-modules": "1.6.0-angular-5",
+    "url": "0.10.3",
+    "zone.js": "0.5.11"
+  },
+  "devDependencies": {
+    "chai": "^3.5.0",
+    "karma": "^0.13.19",
+    "karma-chai": "^0.1.0",
+    "karma-mocha": "^0.2.1",
+    "karma-nativescript-launcher": "^0.3.1",
+    "mocha": "^2.4.5",
+    "nativescript-dev-typescript": "^0.2.2",
+    "shelljs": "^0.5.3",
+    "typescript": "^1.7.5"
+  }
 }

src/nativescript-angular/zone.ts

@@ -28,4 +28,4 @@
         "node_modules",
         "platforms"
     ]
-}
+}