Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (195818 => 195819)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-01-29 17:50:48 UTC (rev 195818)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-01-29 18:00:06 UTC (rev 195819)
@@ -1,6 +1,5 @@
\xFE\xFFvar localizedStrings = new Object;
-localizedStrings["%d More\u2026"] = "%d More\u2026";
localizedStrings[" (Prototype)"] = " (Prototype)";
localizedStrings[" (line %s)"] = " (line %s)";
localizedStrings["%.0f B"] = "%.0f B";
@@ -19,6 +18,7 @@
localizedStrings["%.3fms"] = "%.3fms";
localizedStrings["%d Errors"] = "%d Errors";
localizedStrings["%d Errors, %d Warnings"] = "%d Errors, %d Warnings";
+localizedStrings["%d More\u2026"] = "%d More\u2026";
localizedStrings["%d Warnings"] = "%d Warnings";
localizedStrings["%d \u2A09 %d"] = "%d \u2A09 %d";
localizedStrings["%d \xd7 %d pixels"] = "%d \xd7 %d pixels";
@@ -67,6 +67,7 @@
localizedStrings["All Resources"] = "All Resources";
localizedStrings["All Storage"] = "All Storage";
localizedStrings["All Uncaught Exceptions"] = "All Uncaught Exceptions";
+localizedStrings["Alternates"] = "Alternates";
localizedStrings["An error occurred trying to load the resource."] = "An error occurred trying to load the resource.";
localizedStrings["An error occurred trying to read the %s table."] = "An error occurred trying to read the %s table.";
localizedStrings["An unexpected error %s occurred."] = "An unexpected error %s occurred.";
@@ -112,6 +113,7 @@
localizedStrings["Call Stack"] = "Call Stack";
localizedStrings["Calls"] = "Calls";
localizedStrings["Cancel Automatic Continue"] = "Cancel Automatic Continue";
+localizedStrings["Caps"] = "Caps";
localizedStrings["Capturing"] = "Capturing";
localizedStrings["Catch Variables"] = "Catch Variables";
localizedStrings["Character Data"] = "Character Data";
@@ -270,6 +272,8 @@
localizedStrings["Encoding"] = "Encoding";
localizedStrings["End Capturing"] = "End Capturing";
localizedStrings["Enter Class Name"] = "Enter Class Name";
+localizedStrings["Enter Tag"] = "Enter Tag";
+localizedStrings["Enter Value"] = "Enter Value";
localizedStrings["Enter a Gradient"] = "Enter a Gradient";
localizedStrings["Enter a URL"] = "Enter a URL";
localizedStrings["Enter a name."] = "Enter a name.";
@@ -289,6 +293,7 @@
localizedStrings["Extension Scripts"] = "Extension Scripts";
localizedStrings["Extra Scripts"] = "Extra Scripts";
localizedStrings["Family"] = "Family";
+localizedStrings["Features"] = "Features";
localizedStrings["Filename"] = "Filename";
localizedStrings["Fill"] = "Fill";
localizedStrings["Fill Mode"] = "Fill Mode";
@@ -389,6 +394,7 @@
localizedStrings["Layout Invalidated"] = "Layout Invalidated";
localizedStrings["Left"] = "Left";
localizedStrings["Letter"] = "Letter";
+localizedStrings["Ligatures"] = "Ligatures";
localizedStrings["Line %d"] = "Line %d";
localizedStrings["Line %d:%d"] = "Line %d:%d";
localizedStrings["Line Number"] = "Line Number";
@@ -456,6 +462,7 @@
localizedStrings["Node"] = "Node";
localizedStrings["Not found"] = "Not found";
localizedStrings["Number"] = "Number";
+localizedStrings["Numeric"] = "Numeric";
localizedStrings["Offset"] = "Offset";
localizedStrings["Online"] = "Online";
localizedStrings["Opacity"] = "Opacity";
@@ -676,7 +683,7 @@
localizedStrings["Using Keyword Value"] = "Using Keyword Value";
localizedStrings["Using the previous selector '%s'."] = "Using the previous selector '%s'.";
localizedStrings["Value"] = "Value";
-localizedStrings["Variant"] = "Variant";
+localizedStrings["Variants"] = "Variants";
localizedStrings["Vertical"] = "Vertical";
localizedStrings["Visibility"] = "Visibility";
localizedStrings["Warning: "] = "Warning: ";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (195818 => 195819)
--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-01-29 17:50:48 UTC (rev 195818)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-01-29 18:00:06 UTC (rev 195819)
@@ -38,6 +38,7 @@
// These keywords, as well as the values below, are not localized as they must match the CSS spec.
this._keywords.defaults = ["Inherit", "Initial", "Unset", "Revert"];
+ this._keywords.normal = this._keywords.defaults.concat(["Normal"]);
this._keywords.boxModel = this._keywords.defaults.concat(["Auto"]);
this._keywords.borderStyle = {
basic: this._keywords.defaults.concat(["None", "Hidden", "Solid"]),
@@ -76,10 +77,11 @@
this._generateSection("content", WebInspector.UIString("Content"));
this._generateSection("text-style", WebInspector.UIString("Style"));
this._generateSection("font", WebInspector.UIString("Font"));
+ this._generateSection("font-variants", WebInspector.UIString("Variants"));
this._generateSection("text-spacing", WebInspector.UIString("Spacing"));
this._generateSection("text-shadow", WebInspector.UIString("Shadow"));
- this._sections.text = new WebInspector.DetailsSection("text", WebInspector.UIString("Text"), [this._groups.content.section, this._groups.textStyle.section, this._groups.font.section, this._groups.textSpacing.section, this._groups.textShadow.section]);
+ this._sections.text = new WebInspector.DetailsSection("text", WebInspector.UIString("Text"), [this._groups.content.section, this._groups.textStyle.section, this._groups.font.section, this._groups.fontVariants.section, this._groups.textSpacing.section, this._groups.textShadow.section]);
this.element.appendChild(this._sections.text.element);
// Background Section
@@ -705,10 +707,10 @@
let fontStyleRow = new WebInspector.DetailsSectionRow;
properties.fontStyle = new WebInspector.VisualStyleKeywordIconList("font-style", WebInspector.UIString("Style"), ["Italic", "Normal"]);
- properties.fontVariant = new WebInspector.VisualStyleKeywordCheckbox("font-variant", WebInspector.UIString("Variant"), "Small Caps")
+ properties.fontFeatureSettings = new WebInspector.VisualStyleBasicInput("font-feature-settings", WebInspector.UIString("Features"), WebInspector.UIString("Enter Tag"));
fontStyleRow.element.appendChild(properties.fontStyle.element);
- fontStyleRow.element.appendChild(properties.fontVariant.element);
+ fontStyleRow.element.appendChild(properties.fontFeatureSettings.element);
group.autocompleteCompatibleProperties = [properties.fontFamily];
@@ -716,16 +718,50 @@
this._populateSection(group, [fontGroup]);
}
+ _populateFontVariantsSection()
+ {
+ let group = this._groups.fontVariants;
+ let properties = group.properties;
+
+ let alternatesRow = new WebInspector.DetailsSectionRow;
+
+ properties.fontVariantAlternates = new WebInspector.VisualStyleBasicInput("font-variant-alternates", WebInspector.UIString("Alternates"), WebInspector.UIString("Enter Value"));
+
+ alternatesRow.element.appendChild(properties.fontVariantAlternates.element);
+
+ let positionRow = new WebInspector.DetailsSectionRow;
+
+ properties.fontVariantPosition = new WebInspector.VisualStyleKeywordPicker("font-variant-position", WebInspector.UIString("Position"), this._keywords.normal.concat(["Sub", "Super"]));
+
+ positionRow.element.appendChild(properties.fontVariantPosition.element);
+
+ properties.fontVariantCaps = new WebInspector.VisualStyleKeywordPicker("font-variant-caps", WebInspector.UIString("Caps"), this._keywords.normal.concat(["None", "Small Caps", "All Small Caps", "Petite Caps", "All Petite Caps", "Unicase", "Titling Caps"]));
+
+ positionRow.element.appendChild(properties.fontVariantCaps.element);
+
+ let ligaturesRow = new WebInspector.DetailsSectionRow;
+
+ // FIXME <http://webkit.org/b/153645> Add token based editor for Visual Sidebar
+ properties.fontVariantLigatures = new WebInspector.VisualStyleKeywordPicker("font-variant-ligatures", WebInspector.UIString("Ligatures"), this._keywords.normal.concat(["None", "Common Ligatures", "No Common Ligatures", "Discretionary Ligatures", "No Discretionary Ligatures", "Historical Ligatures", "No Historical Ligatures", "Contextual", "No Contextual"]));
+
+ ligaturesRow.element.appendChild(properties.fontVariantLigatures.element);
+
+ properties.fontVariantNumeric = new WebInspector.VisualStyleKeywordPicker("font-variant-numeric", WebInspector.UIString("Numeric"), this._keywords.normal.concat(["None", "Ordinal", "Slashed Zero", "Lining Nums", "Oldstyle Nums", "Proportional Nums", "Tabular Nums", "Diagonal Fractions", "Stacked Fractions"]));
+
+ ligaturesRow.element.appendChild(properties.fontVariantNumeric.element);
+
+ let variantsGroup = new WebInspector.DetailsSectionGroup([alternatesRow, positionRow, ligaturesRow]);
+ this._populateSection(group, [variantsGroup]);
+ }
+
_populateTextSpacingSection()
{
let group = this._groups.textSpacing;
let properties = group.properties;
- let defaultTextKeywords = this._keywords.defaults.concat(["Normal"]);
-
let textLayoutRow = new WebInspector.DetailsSectionRow;
- properties.lineHeight = new WebInspector.VisualStyleNumberInputBox("line-height", WebInspector.UIString("Height"), defaultTextKeywords, this._units.defaults);
+ properties.lineHeight = new WebInspector.VisualStyleNumberInputBox("line-height", WebInspector.UIString("Height"), this._keywords.normal, this._units.defaults);
properties.verticalAlign = new WebInspector.VisualStyleNumberInputBox("vertical-align", WebInspector.UIString("Align"), ["Baseline", "Bottom"].concat(this._keywords.defaults, ["Middle", "Sub", "Super", "Text Bottom", "Text Top", "Top"]), this._units.defaults);
textLayoutRow.element.appendChild(properties.lineHeight.element);
@@ -733,8 +769,8 @@
let textSpacingRow = new WebInspector.DetailsSectionRow;
- properties.letterSpacing = new WebInspector.VisualStyleNumberInputBox("letter-spacing", WebInspector.UIString("Letter"), defaultTextKeywords, this._units.defaults);
- properties.wordSpacing = new WebInspector.VisualStyleNumberInputBox("word-spacing", WebInspector.UIString("Word"), defaultTextKeywords, this._units.defaults);
+ properties.letterSpacing = new WebInspector.VisualStyleNumberInputBox("letter-spacing", WebInspector.UIString("Letter"), this._keywords.normal, this._units.defaults);
+ properties.wordSpacing = new WebInspector.VisualStyleNumberInputBox("word-spacing", WebInspector.UIString("Word"), this._keywords.normal, this._units.defaults);
textSpacingRow.element.appendChild(properties.letterSpacing.element);
textSpacingRow.element.appendChild(properties.wordSpacing.element);
@@ -1273,7 +1309,7 @@
let animationDirectionRow = new WebInspector.DetailsSectionRow;
properties.animationDirection = new WebInspector.VisualStyleKeywordPicker("animation-direction", WebInspector.UIString("Direction"), {
- basic: this._keywords.defaults.concat(["Normal", "Reverse"]),
+ basic: this._keywords.normal.concat(["Reverse"]),
advanced: ["Alternate", "Alternate Reverse"]
});
properties.animationFillMode = new WebInspector.VisualStyleKeywordPicker("animation-fill-mode", WebInspector.UIString("Fill Mode"), this._keywords.defaults.concat(["None", "Forwards", "Backwards", "Both"]));
