Changeset 276616 in webkit

Timestamp:

Apr 26, 2021, 2:54:22 PM (5 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Audit Tab: Edits are not committed when leaving edit mode unless you first click into another text field
​https://bugs.webkit.org/show_bug.cgi?id=224318
<rdar://problem/76382755>

Reviewed by Devin Rousso.

Save test and setup code when pressing "Done" button. Don't rely on the blur event because it doesn't fire on
the focused element when it's removed from the DOM.

• UserInterface/Models/AuditTestBase.js:

(WI.AuditTestBase.prototype.set setup):

• UserInterface/Models/AuditTestCase.js:

(WI.AuditTestCase.prototype.set test):
Allow setting test and setup after editing is finished.

• UserInterface/Views/AuditTestCaseContentView.js:

(WI.AuditTestCaseContentView.prototype.layout):
(WI.AuditTestCaseContentView.prototype.saveEditedData):

• UserInterface/Views/AuditTestContentView.js:

(WI.AuditTestContentView.prototype.detached):
Saving test on detached saves it when selecting a different test in the navigation sidebar.

(WI.AuditTestContentView.prototype.saveEditedData):
(WI.AuditTestContentView.prototype._createSetupEditor):
(WI.AuditTestContentView.prototype._handleEditingChanged):
(WI.AuditTestContentView):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/AuditTestBase.js (modified) (1 diff)
• UserInterface/Models/AuditTestCase.js (modified) (1 diff)
• UserInterface/Views/AuditTestCaseContentView.js (modified) (3 diffs)
• UserInterface/Views/AuditTestContentView.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-04-26  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Audit Tab: Edits are not committed when leaving edit mode unless you first click into another text field
+        https://bugs.webkit.org/show_bug.cgi?id=224318
+        <rdar://problem/76382755>
+
+        Reviewed by Devin Rousso.
+
+        Save test and setup code when pressing "Done" button. Don't rely on the blur event because it doesn't fire on
+        the focused element when it's removed from the DOM.
+
+        * UserInterface/Models/AuditTestBase.js:
+        (WI.AuditTestBase.prototype.set setup):
+        * UserInterface/Models/AuditTestCase.js:
+        (WI.AuditTestCase.prototype.set test):
+        Allow setting `test` and `setup` after editing is finished.
+
+        * UserInterface/Views/AuditTestCaseContentView.js:
+        (WI.AuditTestCaseContentView.prototype.layout):
+        (WI.AuditTestCaseContentView.prototype.saveEditedData):
+        * UserInterface/Views/AuditTestContentView.js:
+        (WI.AuditTestContentView.prototype.detached):
+        Saving test on `detached` saves it when selecting a different test in the navigation sidebar.
+
+        (WI.AuditTestContentView.prototype.saveEditedData):
+        (WI.AuditTestContentView.prototype._createSetupEditor):
+        (WI.AuditTestContentView.prototype._handleEditingChanged):
+        (WI.AuditTestContentView):
+
 2021-04-26  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/AuditTestBase.js

@@ -122 +122 @@
     {
         console.assert(this.editable);
-        console.assert(WI.auditManager.editing);
         console.assert(typeof setup === "string", setup);
 

trunk/Source/WebInspectorUI/UserInterface/Models/AuditTestCase.js

@@ -101 +101 @@
     {
         console.assert(this.editable);
-        console.assert(WI.auditManager.editing);
         console.assert(typeof test === "string", test);
 

trunk/Source/WebInspectorUI/UserInterface/Views/AuditTestCaseContentView.js

@@ -82 +82 @@
             // Give the rest of the view a chance to load.
             setTimeout(() => {
-                let testCodeMirror = WI.CodeMirrorEditor.create(testEditorElement, {
+                this._testCodeMirror = WI.CodeMirrorEditor.create(testEditorElement, {
                     autoCloseBrackets: true,
                     lineNumbers: true,
@@ -92 +92 @@
                     value: this.representedObject.test,
                 });
-
-                if (this.representedObject.editable) {
-                    testCodeMirror.on("blur", (event) => {
-                        this.representedObject.test = testCodeMirror.getValue().trim();
-                    });
-                }
             });
             return;
@@ -328 +322 @@
     }
 
+    saveEditedData()
+    {
+        super.saveEditedData();
+
+        this.representedObject.test = this._testCodeMirror.getValue().trim();
+    }
+
     showRunningPlaceholder()
     {

trunk/Source/WebInspectorUI/UserInterface/Views/AuditTestContentView.js

@@ -288 +288 @@
 
             WI.auditManager.removeEventListener(WI.AuditManager.Event.EditingChanged, this._handleEditingChanged, this);
+            if (this.representedObject.editable && WI.auditManager.editing)
+                this.saveEditedData();
         }
 
@@ -311 +313 @@
 
         this._placeholderElement = placeholderElement;
+    }
+
+    saveEditedData()
+    {
+        console.assert(this.representedObject.editable, this.representedObject);
+        this.representedObject.setup = this._setupCodeMirror.getValue().trim();
     }
 
@@ -495 +503 @@
         // Give the rest of the view a chance to load.
         setTimeout(() => {
-            let setupCodeMirror = WI.CodeMirrorEditor.create(setupEditorElement, {
+            this._setupCodeMirror = WI.CodeMirrorEditor.create(setupEditorElement, {
                 autoCloseBrackets: true,
                 lineNumbers: true,
@@ -505 +513 @@
                 value: this.representedObject.setup,
             });
-
-            if (this.representedObject.editable) {
-                setupCodeMirror.on("blur", (event) => {
-                    this.representedObject.setup = setupCodeMirror.getValue().trim();
-                });
-            }
         });
 
@@ -579 +581 @@
         this.needsLayout();
 
+        // We only need to save changes when editing is done. No need to save it after entering the editing mode.
+        if (!WI.auditManager.editing && this.representedObject.editable)
+            this.saveEditedData();
+
         this._updateExportNavigationItems();
     }