javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge release in master (#8275)

Browse Source 
* fix the crash

* chore: update MaterialComponents pod (#8176)

* chore: update MaterialComponents pod

* chore: remove copy of pod file in build script

* chore: cut the 6.3.0 release (#8174)

* hore: cut the 6.3.1 release

* fix: handle fake attach after FragMgr is destroyed (#8200)

* fix: check is disposed fragment is in the FragmentManager (#8201)

* release: cut the 6.3.2 release

Co-authored-by: hamidbsd <50081218+hamidbsd@users.noreply.github.com>
Co-authored-by: Vasil Trifonov <v.trifonov@gmail.com>
Co-authored-by: Dimitar Topuzov <dtopuzov@gmail.com>
This commit is contained in:
Alexander Vakrilov
2020-01-27 11:05:46 +02:00
committed by GitHub
parent 02763ecd2c
commit e57d5d9da1
8 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nativescript-core/ui/core/view/view.android.ts
View File

@@ -156,6 +156,8 @@ function initializeDialogFragment() {
const ownerId = this.getArguments().getInt(DOMID);
const options = getModalOptions(ownerId);
this.owner = options.owner;
// Set owner._dialogFragment to this in case the DialogFragment was recreated after app suspend
this.owner._dialogFragment = this;
this._fullscreen = options.fullscreen;
this._animated = options.animated;
this._cancelable = options.cancelable;
@@ -381,11 +383,13 @@ export class View extends ViewCommon {
@profile
public onUnloaded() {
if (this.touchListenerIsSet) {
this.nativeViewProtected.setOnTouchListener(null);
this.touchListenerIsSet = false;
this.nativeViewProtected.setClickable(this._isClickable);
if (this.nativeViewProtected) {
this.nativeViewProtected.setOnTouchListener(null);
this.nativeViewProtected.setClickable(this._isClickable);
}
}
this._manager = null;
this._rootManager = null;
super.onUnloaded();