diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 786adf343..51a081878 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -183,10 +183,11 @@
- nordic.xml
-
+ nordic.xml
+
+
animation.d.ts
@@ -576,6 +577,11 @@
action-bar.d.ts
+
+
+
+
+
@@ -1922,6 +1928,7 @@
PreserveNewest
+
@@ -1984,7 +1991,7 @@
False
-
+
\ No newline at end of file
diff --git a/apps/tests/ui/web-view/web-view-tests.ts b/apps/tests/ui/web-view/web-view-tests.ts
index 3acb0b6b8..6ef3890df 100644
--- a/apps/tests/ui/web-view/web-view-tests.ts
+++ b/apps/tests/ui/web-view/web-view-tests.ts
@@ -30,7 +30,7 @@ var _createWebViewFunc = function (): webViewModule.WebView {
return webView;
}
-export var testLoadExistingUrl = function () {
+function prepare(): webViewModule.WebView {
var newPage: page.Page;
var webView = _createWebViewFunc();
var pageFactory = function (): page.Page {
@@ -41,6 +41,12 @@ export var testLoadExistingUrl = function () {
helper.navigate(pageFactory);
+ return webView;
+}
+
+export var testLoadExistingUrl = function () {
+ var webView = prepare();
+
var testFinished = false;
var actualUrl;
var actualError;
@@ -80,15 +86,7 @@ export var testLoadExistingUrl = function () {
}
export var testLoadLocalFile = function () {
- var newPage: page.Page;
- var webView = _createWebViewFunc();
- var pageFactory = function (): page.Page {
- newPage = new page.Page();
- newPage.content = webView;
- return newPage;
- };
-
- helper.navigate(pageFactory);
+ var webView = prepare();
var testFinished = false;
var actualHtml;
@@ -142,15 +140,7 @@ export var testLoadLocalFile = function () {
}
export var testLoadHTMLString = function () {
- var newPage: page.Page;
- var webView = _createWebViewFunc();
- var pageFactory = function (): page.Page {
- newPage = new page.Page();
- newPage.content = webView;
- return newPage;
- };
-
- helper.navigate(pageFactory);
+ var webView = prepare();
var testFinished = false;
var actualHtml;
@@ -204,15 +194,7 @@ export var testLoadHTMLString = function () {
}
export var testLoadInvalidUrl = function () {
- var newPage: page.Page;
- var webView = _createWebViewFunc();
- var pageFactory = function (): page.Page {
- newPage = new page.Page();
- newPage.content = webView;
- return newPage;
- };
-
- helper.navigate(pageFactory);
+ var webView = prepare();
var testFinished = false;
var actualError;
@@ -237,3 +219,31 @@ export var testLoadInvalidUrl = function () {
TKUnit.assert(false, "TIMEOUT");
}
}
+
+export var testLoadUpperCaseSrc = function () {
+ var webView = prepare();
+
+ var testFinished = false;
+ var actualSrc;
+ var actualError;
+
+ webView.on(webViewModule.WebView.loadFinishedEvent, function (args: webViewModule.LoadEventData) {
+ actualSrc = args.url;
+ actualError = args.error;
+ testFinished = true;
+ });
+ var targetSrc = "HTTP://nsbuild01.telerik.com/docs/";
+ webView.src = targetSrc;
+
+ TKUnit.wait(4);
+
+ helper.goBack();
+
+ if (testFinished) {
+ TKUnit.assert(actualSrc === targetSrc, "args.url should equal '" + targetSrc + "'");
+ TKUnit.assert(actualError === undefined, actualError);
+ }
+ else {
+ TKUnit.assert(false, "TIMEOUT");
+ }
+}
diff --git a/tsconfig.json b/tsconfig.json
index 03d1ff2e0..27cdead8f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,5 @@
{
- "version": "1.5.0-beta",
+ "version": "1.6.2",
"compilerOptions": {
"moduleResolution": "classic",
"target": "es5",
@@ -8,7 +8,8 @@
"noImplicitAny": false,
"removeComments": true,
"noLib": true,
- "outDir": "dist"
+ "outDir": "dist",
+ "experimentalDecorators": true
},
"filesGlob": [
"./**/*.ts",
diff --git a/ui/web-view/web-view-common.ts b/ui/web-view/web-view-common.ts
index c81fc5d60..ccb87fdba 100644
--- a/ui/web-view/web-view-common.ts
+++ b/ui/web-view/web-view-common.ts
@@ -63,7 +63,7 @@ function onSrcPropertyChanged(data: dependencyObservable.PropertyChangeData) {
// register the setNativeValue callback
(srcProperty.metadata).onSetNativeValue = onSrcPropertyChanged;
-export class WebView extends view.View implements definition.WebView {
+export abstract class WebView extends view.View implements definition.WebView {
public static loadStartedEvent = "loadStarted";
public static loadFinishedEvent = "loadFinished";
@@ -119,25 +119,15 @@ export class WebView extends view.View implements definition.WebView {
this.notify(args);
}
- public _loadUrl(url: string) {
- throw new Error("This member is abstract.");
- }
+ abstract _loadUrl(url: string): void;
- public _loadFileOrResource(path: string, content: string) {
- throw new Error("This member is abstract.");
- }
+ abstract _loadFileOrResource(path: string, content: string): void;
- public _loadHttp(src: string) {
- throw new Error("This member is abstract.");
- }
+ abstract _loadHttp(src: string): void;
- public _loadData(src: string) {
- throw new Error("This member is abstract.");
- }
+ abstract _loadData(src: string): void;
- public stopLoading(): void {
- throw new Error("This member is abstract.");
- }
+ abstract stopLoading(): void;
get canGoBack(): boolean {
throw new Error("This member is abstract.");
@@ -147,15 +137,9 @@ export class WebView extends view.View implements definition.WebView {
throw new Error("This member is abstract.");
}
- public goBack() {
- throw new Error("This member is abstract.");
- }
+ abstract goBack(): void;
- public goForward() {
- throw new Error("This member is abstract.");
- }
+ abstract goForward(): void;
- public reload() {
- throw new Error("This member is abstract.");
- }
+ abstract reload(): void;
}
\ No newline at end of file