Changeset 238829 in webkit

Timestamp:

Dec 3, 2018 4:15:22 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Canvas: add singular localized string for "Record first %s frames"
​https://bugs.webkit.org/show_bug.cgi?id=192189

Reviewed by Joseph Pecoraro.

• UserInterface/Views/CanvasOverviewContentView.js:

(WI.CanvasOverviewContentView):
(WI.CanvasOverviewContentView.prototype._setRecordingAutoCaptureFrameCount):
(WI.CanvasOverviewContentView.prototype._updateRecordingAutoCaptureCheckboxLabel): Added.
(WI.CanvasOverviewContentView.prototype._handleRecordingAutoCaptureInput):
(WI.CanvasOverviewContentView.prototype._handleCanvasRecordingAutoCaptureFrameCountChanged):
(WI.CanvasOverviewContentView.prototype.initialLayout): Deleted.
Drive-by: update the auto-capture navigation item when the view is first created so there is
no flashing of in the navigation bar (before initialLayout is called).

• UserInterface/Views/CheckboxNavigationItem.js:

(WI.CheckboxNavigationItem):
(WI.CheckboxNavigationItem.prototype.set label): Added.

• Localizations/en.lproj/localizedStrings.js:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Views/CanvasOverviewContentView.js (modified) (6 diffs)
• UserInterface/Views/CheckboxNavigationItem.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-12-03  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Canvas: add singular localized string for "Record first %s frames"
+        https://bugs.webkit.org/show_bug.cgi?id=192189
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/CanvasOverviewContentView.js:
+        (WI.CanvasOverviewContentView):
+        (WI.CanvasOverviewContentView.prototype._setRecordingAutoCaptureFrameCount):
+        (WI.CanvasOverviewContentView.prototype._updateRecordingAutoCaptureCheckboxLabel): Added.
+        (WI.CanvasOverviewContentView.prototype._handleRecordingAutoCaptureInput):
+        (WI.CanvasOverviewContentView.prototype._handleCanvasRecordingAutoCaptureFrameCountChanged):
+        (WI.CanvasOverviewContentView.prototype.initialLayout): Deleted.
+        Drive-by: update the auto-capture navigation item when the view is first created so there is
+        no flashing of in the navigation bar (before `initialLayout` is called).
+
+        * UserInterface/Views/CheckboxNavigationItem.js:
+        (WI.CheckboxNavigationItem):
+        (WI.CheckboxNavigationItem.prototype.set label): Added.
+
+        * Localizations/en.lproj/localizedStrings.js:
+
 2018-12-03  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -702 +702 @@
 localizedStrings["Reasons for compositing"] = "Reasons for compositing";
 localizedStrings["Reasons for compositing:"] = "Reasons for compositing:";
+localizedStrings["Record first %s frame"] = "Record first %s frame";
 localizedStrings["Record first %s frames"] = "Record first %s frames";
 localizedStrings["Recording"] = "Recording";

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

@@ -52 +52 @@
             this._recordingAutoCaptureFrameCountInputElement.addEventListener("input", this._handleRecordingAutoCaptureInput.bind(this));
 
-            let label = document.createDocumentFragment();
-            String.format(WI.UIString("Record first %s frames"), [this._recordingAutoCaptureFrameCountInputElement], String.standardFormatters, label, (a, b) => {
-                a.append(b);
-                return a;
-            });
-
+            const label = null;
             this._recordingAutoCaptureNavigationItem = new WI.CheckboxNavigationItem("canvas-recording-auto-capture", label, !!WI.settings.canvasRecordingAutoCaptureEnabled.value);
             this._recordingAutoCaptureNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
             this._recordingAutoCaptureNavigationItem.addEventListener(WI.CheckboxNavigationItem.Event.CheckedDidChange, this._handleRecordingAutoCaptureCheckedDidChange, this);
+
+            let frameCount = this._updateRecordingAutoCaptureInputElementSize();
+            this._setRecordingAutoCaptureFrameCount(frameCount);
+            this._updateRecordingAutoCaptureCheckboxLabel(frameCount);
         }
 
@@ -98 +97 @@
 
     // Protected
-
-    initialLayout()
-    {
-        super.initialLayout();
-
-        if (WI.CanvasManager.supportsRecordingAutoCapture()) {
-            this._updateRecordingAutoCaptureInputElementSize();
-            this._setRecordingAutoCaptureFrameCount();
-        }
-    }
 
     contentViewAdded(contentView)
@@ -199 +188 @@
     }
 
-    _setRecordingAutoCaptureFrameCount()
-    {
-        let frameCount = parseInt(this._recordingAutoCaptureFrameCountInputElement.value);
+    _setRecordingAutoCaptureFrameCount(frameCount)
+    {
+        if (isNaN(frameCount))
+            frameCount = parseInt(this._recordingAutoCaptureFrameCountInputElement.value);
+
         console.assert(!isNaN(frameCount) && frameCount >= 0);
 
@@ -210 +201 @@
 
         WI.canvasManager.setRecordingAutoCaptureFrameCount(enabled, frameCount);
+    }
+
+    _updateRecordingAutoCaptureCheckboxLabel(frameCount)
+    {
+        if (isNaN(frameCount))
+            frameCount = parseInt(this._recordingAutoCaptureFrameCountInputElement.value);
+
+        let label = frameCount === 1 ? WI.UIString("Record first %s frame") : WI.UIString("Record first %s frames");
+
+        let selectionStart = this._recordingAutoCaptureFrameCountInputElement.selectionStart;
+        let selectionEnd = this._recordingAutoCaptureFrameCountInputElement.selectionEnd;
+        let direction = this._recordingAutoCaptureFrameCountInputElement.direction;
+
+        let fragment = document.createDocumentFragment();
+        String.format(label, [this._recordingAutoCaptureFrameCountInputElement], String.standardFormatters, fragment, (a, b) => {
+            a.append(b);
+            return a;
+        });
+
+        this._recordingAutoCaptureNavigationItem.label = fragment;
+
+        this._recordingAutoCaptureFrameCountInputElement.selectionStart = selectionStart;
+        this._recordingAutoCaptureFrameCountInputElement.selectionEnd = selectionEnd;
+        this._recordingAutoCaptureFrameCountInputElement.direction = direction;
     }
 
@@ -241 +256 @@
         this._recordingAutoCaptureNavigationItem.checked = !!frameCount;
 
+        this._setRecordingAutoCaptureFrameCount(frameCount);
+    }
+
+    _handleRecordingAutoCaptureCheckedDidChange(event)
+    {
         this._setRecordingAutoCaptureFrameCount();
     }
 
-    _handleRecordingAutoCaptureCheckedDidChange(event)
-    {
-        this._setRecordingAutoCaptureFrameCount();
-    }
-
     _handleCanvasRecordingAutoCaptureEnabledChanged(event)
     {
@@ -257 +272 @@
     {
         this._recordingAutoCaptureFrameCountInputElement.value = WI.settings.canvasRecordingAutoCaptureFrameCount.value;
+
+        this._updateRecordingAutoCaptureCheckboxLabel(WI.settings.canvasRecordingAutoCaptureFrameCount.value);
     }
 

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

@@ -38 +38 @@
         this._checkboxLabel = this.element.appendChild(document.createElement("label"));
         this._checkboxLabel.className = "toggle";
-        this._checkboxLabel.append(label);
         this._checkboxLabel.setAttribute("for", this._checkboxElement.id);
         this._checkboxLabel.addEventListener("click", this._handleLabelClick.bind(this));
+
+        this.label = label;
     }
 
@@ -53 +54 @@
     {
         this._checkboxElement.checked = flag;
+    }
+
+    set label(label)
+    {
+        this._checkboxLabel.removeChildren();
+
+        if (label);
+            this._checkboxLabel.append(label);
     }