From e211082ec72892df2fc921698a26969430495f1e Mon Sep 17 00:00:00 2001 From: Marc Laval Date: Thu, 6 Oct 2016 22:59:55 +0200 Subject: [PATCH 1/2] chore(deps): update React Native to 0.34.1 --- package.json | 2 +- src/components/common/webview.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bb26045..4219b85 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@angular/platform-server": "2.0.0", "@angular/router": "3.0.0", "hammerjs": "2.0.6", - "react-native": "0.32.0", + "react-native": "0.34.1", "reflect-metadata": "0.1.8", "rxjs": "5.0.0-beta.12", "zone.js": "mlaval/zone.js#0.6.23-fixed-for-RN" diff --git a/src/components/common/webview.ts b/src/components/common/webview.ts index a2cda56..f7f5d2d 100644 --- a/src/components/common/webview.ts +++ b/src/components/common/webview.ts @@ -34,6 +34,7 @@ export class Sample {} template: `` }) export class WebView extends HighLevelComponent{ @@ -56,6 +57,10 @@ export class WebView extends HighLevelComponent{ * To be documented */ @Output() loadingError: EventEmitter = new EventEmitter(); + /** + * To be documented + */ + @Output() contentSizeChange: EventEmitter = new EventEmitter(); //Properties public _automaticallyAdjustContentInsets: boolean; @@ -122,7 +127,7 @@ export class WebView extends HighLevelComponent{ */ set scrollEnabled(value: any) {this._scrollEnabled = this.processBoolean(value); } - //Event handlers + //Event handlers _handleLoadingStart(event: any) { this.loadingStart.emit({canGoBack: event.canGoBack, canGoForward: event.canGoForward, loading: event.loading, title: event.title, url: event.url}); } @@ -135,6 +140,10 @@ export class WebView extends HighLevelComponent{ this.loadingError.emit({canGoBack: event.canGoBack, canGoForward: event.canGoForward, loading: event.loading, title: event.title, url: event.url, code: event.code, description: event.description}); } + _handleContentSizeChange(event: any) { + this.contentSizeChange.emit(event); + } + //Commands /** * To be documented From ae8785d876267951c296f17d777fd647614e3466 Mon Sep 17 00:00:00 2001 From: Marc Laval Date: Thu, 6 Oct 2016 23:18:13 +0200 Subject: [PATCH 2/2] chore(deps): update Angular to 2.0.2 --- gulpfile.js | 4 ++-- package.json | 20 ++++++++++---------- src/components/common/webview.ts | 2 +- src/renderer/renderer.ts | 6 ++++++ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index a5a862e..6a2705c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -86,7 +86,7 @@ gulp.task('!assets', function () { return gulp.src(PATHS.sources.sampleAssets).pipe(gulp.dest(PATHS.app + '/' + APP_NAME)); }); gulp.task('!transpile', ['!assets'], function () { - return ts2js([PATHS.sources.sample, PATHS.sources.src], PATHS.tmp); + return ts2js([PATHS.sources.sample, PATHS.sources.src], PATHS.tmp, false, false); }); gulp.task('!copyToNodeModules', ['!transpile'], function () { return gulp.src(PATHS.tmp + '/src/**/*').pipe(gulp.dest(PATHS.app + '/' + APP_NAME + '/node_modules/angular2-react-native')); @@ -181,7 +181,7 @@ gulp.task('start.ios.aot', function (neverDone) { /******************************* BROWSER **************************************/ /**********************************************************************************/ gulp.task('ts2system', ['clean.code'], function () { - return ts2js([PATHS.sources.src, PATHS.sources.test], PATHS.destination, true); + return ts2js([PATHS.sources.src, PATHS.sources.test], PATHS.destination, true, false); }); gulp.task('karma-launch', function() { diff --git a/package.json b/package.json index 4219b85..fe30f16 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "homepage": "https://github.com/angular/react-native-renderer/", "devDependencies": { - "@angular/compiler-cli": "0.6.2", + "@angular/compiler-cli": "0.6.4", "babel-preset-es2015": "^6.14.0", "del": "^1.2.0", "glob": "^4.0.6", @@ -49,17 +49,17 @@ "systemjs": "^0.19.9", "systemjs-builder": "^0.15.14", "through2": "~0.6.3", - "typescript": "^2.0.2" + "typescript": "^2.0.3" }, "dependencies": { - "@angular/common": "2.0.0", - "@angular/compiler": "2.0.0", - "@angular/core": "2.0.0", - "@angular/http": "2.0.0", - "@angular/platform-browser": "2.0.0", - "@angular/platform-browser-dynamic": "2.0.0", - "@angular/platform-server": "2.0.0", - "@angular/router": "3.0.0", + "@angular/common": "2.0.2", + "@angular/compiler": "2.0.2", + "@angular/core": "2.0.2", + "@angular/http": "2.0.2", + "@angular/platform-browser": "2.0.2", + "@angular/platform-browser-dynamic": "2.0.2", + "@angular/platform-server": "2.0.2", + "@angular/router": "3.0.2", "hammerjs": "2.0.6", "react-native": "0.34.1", "reflect-metadata": "0.1.8", diff --git a/src/components/common/webview.ts b/src/components/common/webview.ts index f7f5d2d..8a97ba1 100644 --- a/src/components/common/webview.ts +++ b/src/components/common/webview.ts @@ -127,7 +127,7 @@ export class WebView extends HighLevelComponent{ */ set scrollEnabled(value: any) {this._scrollEnabled = this.processBoolean(value); } - //Event handlers + //Event handlers _handleLoadingStart(event: any) { this.loadingStart.emit({canGoBack: event.canGoBack, canGoForward: event.canGoForward, loading: event.loading, title: event.title, url: event.url}); } diff --git a/src/renderer/renderer.ts b/src/renderer/renderer.ts index 07a33a0..6083d14 100644 --- a/src/renderer/renderer.ts +++ b/src/renderer/renderer.ts @@ -41,6 +41,12 @@ export class ReactNativeElementSchemaRegistry extends ElementSchemaRegistry { securityContext(tagName: string, propName: string): any { return 0; } + validateProperty(name: string): {error: boolean; msg?: string} { + return {error: false}; + } + validateAttribute(name: string): {error: boolean; msg?: string} { + return {error: false}; + } } export class ReactNativeSanitizer implements Sanitizer {