Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 5b47bb2

Browse files
authored
chore(deps): update Angular to 2.4.1 (#101)
1 parent a878de1 commit 5b47bb2

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"homepage": "https://github.com/angular/react-native-renderer/",
2727
"devDependencies": {
28-
"@angular/compiler-cli": "0.6.4",
28+
"@angular/compiler-cli": "2.4.1",
2929
"babel-preset-es2015": "^6.14.0",
3030
"del": "^1.2.0",
3131
"glob": "^4.0.6",
@@ -49,21 +49,21 @@
4949
"systemjs": "^0.19.9",
5050
"systemjs-builder": "^0.15.14",
5151
"through2": "~0.6.3",
52-
"typescript": "^2.0.3"
52+
"typescript": "2.0.10"
5353
},
5454
"dependencies": {
55-
"@angular/common": "2.1.0",
56-
"@angular/compiler": "2.1.0",
57-
"@angular/core": "2.1.0",
58-
"@angular/http": "2.1.0",
59-
"@angular/platform-browser": "2.1.0",
60-
"@angular/platform-browser-dynamic": "2.1.0",
61-
"@angular/platform-server": "2.1.0",
62-
"@angular/router": "3.1.0",
55+
"@angular/common": "2.4.1",
56+
"@angular/compiler": "2.4.1",
57+
"@angular/core": "2.4.1",
58+
"@angular/http": "2.4.1",
59+
"@angular/platform-browser": "2.4.1",
60+
"@angular/platform-browser-dynamic": "2.4.1",
61+
"@angular/platform-server": "2.4.1",
62+
"@angular/router": "3.4.1",
6363
"hammerjs": "2.0.6",
6464
"react-native": "0.39.2",
6565
"reflect-metadata": "0.1.8",
66-
"rxjs": "5.0.0-beta.12",
67-
"zone.js": "mlaval/zone.js#0.6.23-fixed-for-RN"
66+
"rxjs": "5.0.1",
67+
"zone.js": "0.7.4"
6868
}
6969
}

src/components/common/text.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import {Component} from "@angular/core";
2-
import {isAndroid} from "../../wrapper/wrapper";
1+
import {Component, Inject} from "@angular/core";
2+
import {REACT_NATIVE_WRAPPER} from "../../renderer/renderer";
3+
import {ReactNativeWrapper, isAndroid} from "../../wrapper/wrapper";
34
import {HighLevelComponent, GENERIC_INPUTS, GENERIC_BINDINGS} from "./component";
45

56
var ANDROID_INPUTS: Array<string> = ['selectable'];
@@ -29,6 +30,10 @@ export class Sample {}
2930
${GENERIC_BINDINGS} ${isAndroid() ? ANDROID_BINDINGS : IOS_BINDINGS}><ng-content></ng-content></native-text>`
3031
})
3132
export class Text extends HighLevelComponent{
33+
constructor(@Inject(REACT_NATIVE_WRAPPER) wrapper: ReactNativeWrapper) {
34+
super(wrapper);
35+
}
36+
3237
//Properties
3338
public _lineBreakMode: string;
3439
public _numberOfLines: number;

src/renderer/renderer.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ export class ReactNativeRenderer implements Renderer {
278278

279279
setElementAttribute(renderElement: Node, attributeName: string, attributeValue: string): void {
280280
var val: any = attributeValue;
281+
if (attributeName == "ng-version") return;
281282
if (attributeValue == "false") val = false;
282283
if (attributeValue == "true") val = true;
283284
if (attributeValue == "null") val = null;

0 commit comments

Comments
 (0)