wip: ckeditor5#1731 - remove useless nulls.

ckeditor · Jun 5, 2019 · 067bd09 · 067bd09
1 parent 66e22d1
commit 067bd09
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/src/linkui.js b/src/linkui.js
@@ -89,10 +89,8 @@ export default class LinkUI extends Plugin {
 		super.destroy();
 
 		// Destroy created UI components as they are not automatically destroyed (see ckeditor5#1341).
-		this.formView && this.formView.destroy();
-		this.formView = null;
-		this.actionsView && this.actionsView.destroy();
-		this.actionsView = null;
+		this.formView.destroy();
+		this.actionsView.destroy();
 	}
 
 	/**

diff --git a/src/ui/linkactionsview.js b/src/ui/linkactionsview.js
@@ -134,16 +134,14 @@ export default class LinkActionsView extends View {
 
 	destroy() {
 		super.destroy();
-		this.focusTracker && this.focusTracker && this.focusTracker.destroy(); this.focusTracker = null;
-		this.keystrokes && this.keystrokes && this.keystrokes.destroy(); this.keystrokes = null;
-		this._focusCycler && this._focusCycler && this._focusCycler.destroy(); this._focusCycler = null;
+
+		this.focusTracker.destroy();
+		this.keystrokes.destroy();
+		this._focusCycler.destroy();
 
 		this.previewButtonView && this.previewButtonView.destroy();
-		this.previewButtonView = null;
 		this.editButtonView && this.editButtonView.destroy();
-		this.editButtonView = null;
 		this.unlinkButtonView && this.unlinkButtonView.destroy();
-		this.unlinkButtonView = null;
 	}
 
 	/**

diff --git a/src/ui/linkformview.js b/src/ui/linkformview.js
@@ -130,16 +130,13 @@ export default class LinkFormView extends View {
 	destroy() {
 		super.destroy();
 
-		this.focusTracker && this.focusTracker && this.focusTracker.destroy(); this.focusTracker = null;
-		this.keystrokes && this.keystrokes && this.keystrokes.destroy(); this.keystrokes = null;
-		this._focusCycler && this._focusCycler && this._focusCycler.destroy(); this._focusCycler = null;
-		// todo not:
-		this.urlInputView && this.urlInputView.destroy();
-		this.urlInputView = null;
-		this.saveButtonView && this.saveButtonView.destroy();
-		this.saveButtonView = null;
-		this.cancelButtonView && this.cancelButtonView.destroy();
-		this.cancelButtonView = null;
+		this.focusTracker.destroy();
+		this.keystrokes.destroy();
+		this._focusCycler.destroy();
+
+		this.urlInputView.destroy();
+		this.saveButtonView.destroy();
+		this.cancelButtonView.destroy();
 	}
 
 	/**