Commit fcec0237 authored by Hixie's avatar Hixie

Specs and Docs: minor updates to fix mistakes I found when proof-reading

Review URL: https://codereview.chromium.org/845053002
parent 4002105a
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
} }
} }
sky.registerLayoutManager('beehive', BeehiveLayoutManager); sky.registerLayoutManager('beehive', BeehiveLayoutManager);
let BeehiveCountStyleValueType = new StyleValueType(); let BeehiveCountStyleGrammar = new StyleGrammar();
BeehiveCountStyleValueType.addParser((tokens) => { BeehiveCountStyleGrammar.addParser((tokens) => {
let token = tokens.next(); let token = tokens.next();
if (token.done) if (token.done)
throw new Error(); throw new Error();
...@@ -126,13 +126,11 @@ ...@@ -126,13 +126,11 @@
throw new Error(); throw new Error();
if (Math.trunc(token.value.value) != token.value.value) // is integer if (Math.trunc(token.value.value) != token.value.value) // is integer
throw new Error(); throw new Error();
return { return new NumericStyleValue(token.value.value);
value: token.value.value;
}
}); });
sky.registerProperty({ sky.registerProperty({
name: 'beehive-count', name: 'beehive-count',
type: BeehiveCountStyleValueType, type: BeehiveCountStyleGrammar,
inherits: true, inherits: true,
initialValue: 5, initialValue: 5,
needsLayout: true, needsLayout: true,
......
...@@ -21,8 +21,8 @@ SKY MODULE ...@@ -21,8 +21,8 @@ SKY MODULE
displayTypes.set(displayValue, layoutManagerConstructor); displayTypes.set(displayValue, layoutManagerConstructor);
}; };
module.exports.DisplayStyleValueType = new StyleValueType(); // value is null or a LayoutManagerConstructor module.exports.DisplayStyleGrammar = new StyleGrammar(); // value is null or a LayoutManagerConstructor
module.exports.DisplayStyleValueType.addParser((tokens) => { module.exports.DisplayStyleGrammar.addParser((tokens) => {
let token = tokens.next(); let token = tokens.next();
if (token.done) if (token.done)
throw new Error(); throw new Error();
...@@ -37,14 +37,14 @@ SKY MODULE ...@@ -37,14 +37,14 @@ SKY MODULE
internals.registerProperty({ internals.registerProperty({
name: 'display', name: 'display',
type: module.exports.DisplayStyleValueType, type: module.exports.DisplayStyleGrammar,
inherits: false, inherits: false,
initialValue: internals.BlockLayoutManager, initialValue: internals.BlockLayoutManager,
needsLayout: true, needsLayout: true,
}); });
module.exports.PositiveLengthStyleValueType = new StyleValueType(); // value is a ParsedValue whose value (once resolved) is a number in 96dpi pixels, >=0 module.exports.PositiveLengthStyleGrammar = new StyleGrammar(); // value is a ParsedValue whose value (once resolved) is a number in 96dpi pixels, >=0
module.exports.PositiveLengthStyleValueType.addParser((tokens) => { module.exports.PositiveLengthStyleGrammar.addParser((tokens) => {
// just handle "<number>px" // just handle "<number>px"
let token = tokens.next(); let token = tokens.next();
if (token.done) if (token.done)
...@@ -62,21 +62,21 @@ SKY MODULE ...@@ -62,21 +62,21 @@ SKY MODULE
internals.registerProperty({ internals.registerProperty({
name: 'min-width', name: 'min-width',
type: module.exports.PositiveLengthStyleValueType, type: module.exports.PositiveLengthStyleGrammar,
inherits: false, inherits: false,
initialValue: 0, initialValue: 0,
needsLayout: true, needsLayout: true,
}); });
internals.registerProperty({ internals.registerProperty({
name: 'min-height', name: 'min-height',
type: module.exports.PositiveLengthStyleValueType, type: module.exports.PositiveLengthStyleGrammar,
inherits: false, inherits: false,
initialValue: 0, initialValue: 0,
needsLayout: true, needsLayout: true,
}); });
module.exports.PositiveLengthOrAutoStyleValueType = new StyleValueType(); // value is a ParsedValue whose value (once resolved) is either a number in 96dpi pixels (>=0) or null (meaning 'auto') module.exports.PositiveLengthOrAutoStyleGrammar = new StyleGrammar(); // value is a ParsedValue whose value (once resolved) is either a number in 96dpi pixels (>=0) or null (meaning 'auto')
module.exports.PositiveLengthOrAutoStyleValueType.addParser((tokens) => { module.exports.PositiveLengthOrAutoStyleGrammar.addParser((tokens) => {
// handle 'auto' // handle 'auto'
let token = tokens.next(); let token = tokens.next();
if (token.done) if (token.done)
...@@ -89,27 +89,27 @@ SKY MODULE ...@@ -89,27 +89,27 @@ SKY MODULE
value: null, value: null,
}; };
}); });
module.exports.PositiveLengthOrAutoStyleValueType.addParser((tokens) => { module.exports.PositiveLengthOrAutoStyleGrammar.addParser((tokens) => {
return module.exports.PositiveLengthStyleValueType.parse(tokens); return module.exports.PositiveLengthStyleGrammar.parse(tokens);
}); });
internals.registerProperty({ internals.registerProperty({
name: 'width', name: 'width',
type: module.exports.PositiveLengthOrAutoStyleValueType, type: module.exports.PositiveLengthOrAutoStyleGrammar,
inherits: false, inherits: false,
initialValue: null, initialValue: null,
needsLayout: true, needsLayout: true,
}); });
internals.registerProperty({ internals.registerProperty({
name: 'height', name: 'height',
type: module.exporets.PositiveLengthOrAutoStyleValueType, type: module.exporets.PositiveLengthOrAutoStyleGrammar,
inherits: false, inherits: false,
initialValue: null, initialValue: null,
needsLayout: true, needsLayout: true,
}); });
module.exports.PositiveLengthOrInfinityStyleValueType = new StyleValueType(); // value is a ParsedValue whose value (once resolved) is either a number in 96dpi pixels (>=0) or Infinity module.exports.PositiveLengthOrInfinityStyleGrammar = new StyleGrammar(); // value is a ParsedValue whose value (once resolved) is either a number in 96dpi pixels (>=0) or Infinity
module.exports.PositiveLengthOrInfinityStyleValueType.addParser((tokens) => { module.exports.PositiveLengthOrInfinityStyleGrammar.addParser((tokens) => {
// handle 'infinity' // handle 'infinity'
let token = tokens.next(); let token = tokens.next();
if (token.done) if (token.done)
...@@ -122,20 +122,20 @@ SKY MODULE ...@@ -122,20 +122,20 @@ SKY MODULE
value: Infinity, value: Infinity,
}; };
}); });
module.exports.PositiveLengthOrInfinityStyleValueType.addParser((tokens) => { module.exports.PositiveLengthOrInfinityStyleGrammar.addParser((tokens) => {
return module.exports.PositiveLengthStyleValueType.parse(tokens); return module.exports.PositiveLengthStyleGrammar.parse(tokens);
}); });
internals.registerProperty({ internals.registerProperty({
name: 'width', name: 'width',
type: module.exports.PositiveLengthOrInfinityStyleValueType, type: module.exports.PositiveLengthOrInfinityStyleGrammar,
inherits: false, inherits: false,
initialValue: Infinity, initialValue: Infinity,
needsLayout: true, needsLayout: true,
}); });
internals.registerProperty({ internals.registerProperty({
name: 'height', name: 'height',
type: module.exporets.PositiveLengthOrInfinityStyleValueType, type: module.exporets.PositiveLengthOrInfinityStyleGrammar,
inherits: false, inherits: false,
initialValue: Infinity, initialValue: Infinity,
needsLayout: true, needsLayout: true,
......
...@@ -10,7 +10,7 @@ SKY MODULE ...@@ -10,7 +10,7 @@ SKY MODULE
sky.registerLayoutManager('spring', module.exports.SpringLayoutManager); sky.registerLayoutManager('spring', module.exports.SpringLayoutManager);
sky.registerProperty({ sky.registerProperty({
name: 'toolbar-spacing', name: 'toolbar-spacing',
type: sky.PositiveLengthStyleValueType, type: sky.PositiveLengthStyleGrammar,
inherits: true, inherits: true,
initialValue: 8, initialValue: 8,
needsLayout: true, needsLayout: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment