From ecca5a31f24679455ba4852482ae3c1d25dc63d2 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Mon, 2 Dec 2019 23:00:50 -0800 Subject: [PATCH] fix(ios): remove UIWebView references since it's deprecated --- CHANGELOG.md | 6 +++--- src/package.json | 14 +++++++------- src/pulltorefresh.ios.ts | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a374be..f14a7bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ **Closed issues:** -- JS ERROR Error: Content must inherit from either UIScrollView, UIWebView or WKWebView! [\#46](https://github.com/nstudio/nativescript-pulltorefresh/issues/46) +- JS ERROR Error: Content must inherit from either UIScrollView or WKWebView! [\#46](https://github.com/nstudio/nativescript-pulltorefresh/issues/46) - nativescript-vue [\#42](https://github.com/nstudio/nativescript-pulltorefresh/issues/42) - How to register element properly? [\#41](https://github.com/nstudio/nativescript-pulltorefresh/issues/41) @@ -94,7 +94,7 @@ - Cannot scroll ListView up [\#19](https://github.com/nstudio/nativescript-pulltorefresh/issues/19) - Not working in TNS 2.5 [\#18](https://github.com/nstudio/nativescript-pulltorefresh/issues/18) -- Support UIWebView on ios [\#15](https://github.com/nstudio/nativescript-pulltorefresh/issues/15) +- Support on ios [\#15](https://github.com/nstudio/nativescript-pulltorefresh/issues/15) - Question: Using in NS angular project [\#14](https://github.com/nstudio/nativescript-pulltorefresh/issues/14) - Typescript Error While Registering PullToRefresh In NG2 App [\#13](https://github.com/nstudio/nativescript-pulltorefresh/issues/13) - Angular2 version of pulltorefresh [\#11](https://github.com/nstudio/nativescript-pulltorefresh/issues/11) @@ -103,7 +103,7 @@ - Update iOS app resources [\#21](https://github.com/nstudio/nativescript-pulltorefresh/pull/21) ([dtopuzov](https://github.com/dtopuzov)) - Updated README.md for Nativescript Angular 2 Usage [\#20](https://github.com/nstudio/nativescript-pulltorefresh/pull/20) ([dlucidone](https://github.com/dlucidone)) -- Extend code to support UIWebView \#15 [\#16](https://github.com/nstudio/nativescript-pulltorefresh/pull/16) ([ahalls](https://github.com/ahalls)) +- Extend code to support \#15 [\#16](https://github.com/nstudio/nativescript-pulltorefresh/pull/16) ([ahalls](https://github.com/ahalls)) ## [1.1.8](https://github.com/nstudio/nativescript-pulltorefresh/tree/1.1.8) (2016-09-08) **Closed issues:** diff --git a/src/package.json b/src/package.json index 205fddb..3ca4313 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "@nstudio/nativescript-pulltorefresh", - "version": "1.0.1", + "version": "1.1.0", "description": "A NativeScript plugin to provide the Pull to Refresh control on any view.", "main": "pulltorefresh", "typings": "index.d.ts", @@ -70,12 +70,12 @@ "devDependencies": { "husky": "^3.0.0", "lint-staged": "^9.1.0", - "prettier": "^1.18.2", - "tns-core-modules": "~6.0.1", - "tns-platform-declarations": "~6.0.1", - "nativescript-ui-listview": "^5.2.0", + "prettier": "^1.19.0", + "tns-core-modules": "~6.2.0", + "tns-platform-declarations": "~6.2.0", + "nativescript-ui-listview": "~8.0.1", "rimraf": "^2.6.3", - "tslint": "~5.18.0", - "typescript": "~3.4.5" + "tslint": "~5.20.0", + "typescript": "~3.5.3" } } diff --git a/src/pulltorefresh.ios.ts b/src/pulltorefresh.ios.ts index 804858f..c9bdb3c 100644 --- a/src/pulltorefresh.ios.ts +++ b/src/pulltorefresh.ios.ts @@ -66,7 +66,7 @@ export class PullToRefresh extends PullToRefreshBase { this.content.ios.addSubview(this.refreshControl); } - } else if (this.content.ios instanceof UIWebView) { + } else if (this.content.ios instanceof WKWebView) { if (SUPPORT_REFRESH_CONTROL) { this.content.ios.scrollView.refreshControl = this.refreshControl; } else { @@ -98,7 +98,7 @@ export class PullToRefresh extends PullToRefreshBase { } } else { throw new Error( - 'Content must inherit from either UIScrollView, UIWebView or WKWebView!' + 'Content must inherit from either UIScrollView or WKWebView!' ); } }