Attachment 357460 Details for Bug 192766 – Patch

[patch] Patch

bug-192766-20181217113832.patch (text/plain), 5.91 KB, created by Devin Rousso on 2018-12-17 11:38:33 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2018-12-17 11:38:33 PST

Size: 5.91 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 9152ad45a76b7b16c7970000dfa89f9f834c0cdf..a7e1a83d435f3179fef59f1085618b185d989770 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-12-17  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Settings: add singular "space" UIString
>+        https://bugs.webkit.org/show_bug.cgi?id=192766
>+        <rdar://problem/46776948>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/SettingEditor.js:
>+        (WI.SettingEditor):
>+        (WI.SettingEditor.prototype.get label):
>+        (WI.SettingEditor.prototype.set label): Added.
>+
>+        * UserInterface/Views/SettingsTabContentView.js:
>+        (WI.SettingsTabContentView.prototype._createGeneralSettingsView):
>+        (WI.SettingsTabContentView.prototype._createGeneralSettingsView.addSpacesSetting): Added.
>+        (WI.SettingsTabContentView.prototype._createGeneralSettingsView.addSpacesSetting.updateLabel): Added.
>+
>+        * Localizations/en.lproj/localizedStrings.js:
>+
> 2018-12-15  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Styles: toggling selected properties may cause data corruption
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index 0d1dba8a59daa7756ec278f99be8e01629e0f550..a9cbacf15d055e6d7bd7305ba65c991ef2b8930b 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -1043,6 +1043,7 @@ localizedStrings["line "] = "line ";
> localizedStrings["originally %s"] = "originally %s";
> localizedStrings["popup"] = "popup";
> localizedStrings["popup, toggle"] = "popup, toggle";
>+localizedStrings["space"] = "space";
> localizedStrings["spaces"] = "spaces";
> localizedStrings["time before stopping"] = "time before stopping";
> localizedStrings["times before stopping"] = "times before stopping";
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SettingEditor.js b/Source/WebInspectorUI/UserInterface/Views/SettingEditor.js
>index add0e386e5ce1d4293ac4fd4d7c915992823bd32..648baa6b14aba37684fe46177b2124eb31bcd82a 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SettingEditor.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SettingEditor.js
>@@ -30,7 +30,6 @@ WI.SettingEditor = class SettingEditor extends WI.Object
>         super();
> 
>         this._type = type;
>-        this._label = label;
>         this._value = null;
> 
>         this._editorElement = this._createEditorElement(options);
>@@ -40,14 +39,7 @@ WI.SettingEditor = class SettingEditor extends WI.Object
>         this._element.classList.add("editor");
>         this._element.append(this._editorElement);
> 
>-        if (this._label) {
>-            this._editorElement.id = "setting-editor-" + WI.SettingEditor._nextEditorIdentifier++;
>-            let labelElement = document.createElement("label");
>-            labelElement.setAttribute("for", this._editorElement.id);
>-            labelElement.textContent = label;
>-
>-            this._element.append(labelElement);
>-        }
>+        this.label = label;
>     }
> 
>     static createForSetting(setting, label, options)
>@@ -74,7 +66,36 @@ WI.SettingEditor = class SettingEditor extends WI.Object
> 
>     get element() { return this._element; }
>     get type() { return this._type; }
>-    get label() { return this._label; }
>+
>+    get label()
>+    {
>+        return this._label;
>+    }
>+
>+    set label(label)
>+    {
>+        if (label === this._label)
>+            return;
>+
>+        this._label = label;
>+
>+        if (!this._label) {
>+            if (this._labelElement)
>+                this._labelElement.remove();
>+
>+            this._editorElement.removeAttribute("id");
>+            this._labelElement = null;
>+            return;
>+        }
>+
>+        if (!this._labelElement) {
>+            this._editorElement.id = "setting-editor-" + WI.SettingEditor._nextEditorIdentifier++;
>+            this._labelElement = this._element.appendChild(document.createElement("label"));
>+            this._labelElement.setAttribute("for", this._editorElement.id);
>+        }
>+
>+        this._labelElement.textContent = this._label;
>+    }
> 
>     get value()
>     {
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>index e4d56f2fc7d8756ccf150d7397fd41117a5a8331..60511de3b2d07adbed3e27fd909e865244381c87 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>@@ -184,11 +184,19 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
>             WI.settings.indentWithTabs.value = indentEditor.value === indentValues[0];
>         });
> 
>-        const widthLabel = WI.UIString("spaces");
>-        const widthOptions = {min: 1};
>+        function addSpacesSetting(title, setting) {
>+            let editor = generalSettingsView.addSetting(title, setting, WI.UIString("spaces"), {min: 1});
> 
>-        generalSettingsView.addSetting(WI.UIString("Tab width:"), WI.settings.tabSize, widthLabel, widthOptions);
>-        generalSettingsView.addSetting(WI.UIString("Indent width:"), WI.settings.indentUnit, widthLabel, widthOptions);
>+            function updateLabel() {
>+                editor.label = setting.value === 1 ? WI.UIString("space") : WI.UIString("spaces");
>+            }
>+            setting.addEventListener(WI.Setting.Event.Changed, (event) => {
>+                updateLabel();
>+            });
>+            updateLabel();
>+        }
>+        addSpacesSetting(WI.UIString("Tab width:"), WI.settings.tabSize);
>+        addSpacesSetting(WI.UIString("Indent width:"), WI.settings.indentUnit);
> 
>         generalSettingsView.addSetting(WI.UIString("Line wrapping:"), WI.settings.enableLineWrapping, WI.UIString("Wrap lines to editor width"));
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192766: 357460