Skip to content

Commit fba219c

Browse files
nzakasnzakas
committed
Official release
1 parent 8be1864 commit fba219c

File tree

9 files changed

+70
-23
lines changed

9 files changed

+70
-23
lines changed

‎CHANGELOG

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
January 17, 2013 - v0.2.2
2+
3+
* Merge pull request #57 from nschonni/allow-device-pixel-ratio-gh-23 (Nicholas C. Zakas)
4+
* Merge pull request #56 from nschonni/appearance-none (Nicholas C. Zakas)
5+
* Allow pixel ratios in media queries (Nick Schonning)
6+
* Add none to appearance values (Nick Schonning)
7+
* Merge pull request #43 from nschonni/display-moz-inline-stack (Nicholas C. Zakas)
8+
* Add -moz display properties (Nick Schonning)
9+
* Merge pull request #51 from nschonni/add-gitignore-for-build (Nicholas C. Zakas)
10+
* Trim default gitconfig (Nick Schonning)
11+
* Remove build folder and exclude it (Nick Schonning)
12+
13+
114
December 4, 2012 - v0.2.1
215

316
* Merge pull request #46 from nschonni/fix-vertical-align-missing-values (Nicholas C. Zakas)
@@ -305,6 +318,8 @@ November 28, 2011 - v0.1.0
305318

306319

307320

321+
322+
308323

309324

310325

‎build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project name="parserlib" default="build.all">
22

33
<!-- version number -->
4-
<property name="parserlib.version" value="0.2.1" />
4+
<property name="parserlib.version" value="0.2.2" />
55

66
<!-- the directories containing the source files -->
77
<property name="src.dir" value="./src" />

‎release/node-parserlib.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
24+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
934+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -2562,7 +2562,7 @@ Parser.prototype = function(){
25622562
while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
25632563
Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
25642564
Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
2565-
Tokens.RESOLUTION])){
2565+
Tokens.RESOLUTION, Tokens.SLASH])){
25662566

25672567
value += tokenStream.token().value;
25682568
value += this._readWhitespace();
@@ -3508,7 +3508,7 @@ var Properties = {
35083508
"-o-animation-name" : { multi: "none | <ident>", comma: true },
35093509
"-o-animation-play-state" : { multi: "running | paused", comma: true },
35103510

3511-
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | inherit",
3511+
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | none | inherit",
35123512
"azimuth" : function (expression) {
35133513
var simple = "<angle> | leftwards | rightwards | inherit",
35143514
direction = "left-side | far-left | left | center-left | center | center-right | right | far-right | right-side",
@@ -3717,7 +3717,7 @@ var Properties = {
37173717

37183718
//D
37193719
"direction" : "ltr | rtl | inherit",
3720-
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit",
3720+
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker",
37213721
"dominant-baseline" : 1,
37223722
"drop-initial-after-adjust" : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
37233723
"drop-initial-after-align" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",

‎release/npm/lib/node-parserlib.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
24+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
934+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -2562,7 +2562,7 @@ Parser.prototype = function(){
25622562
while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
25632563
Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
25642564
Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
2565-
Tokens.RESOLUTION])){
2565+
Tokens.RESOLUTION, Tokens.SLASH])){
25662566

25672567
value += tokenStream.token().value;
25682568
value += this._readWhitespace();
@@ -3508,7 +3508,7 @@ var Properties = {
35083508
"-o-animation-name" : { multi: "none | <ident>", comma: true },
35093509
"-o-animation-play-state" : { multi: "running | paused", comma: true },
35103510

3511-
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | inherit",
3511+
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | none | inherit",
35123512
"azimuth" : function (expression) {
35133513
var simple = "<angle> | leftwards | rightwards | inherit",
35143514
direction = "left-side | far-left | left | center-left | center | center-right | right | far-right | right-side",
@@ -3717,7 +3717,7 @@ var Properties = {
37173717

37183718
//D
37193719
"direction" : "ltr | rtl | inherit",
3720-
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit",
3720+
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker",
37213721
"dominant-baseline" : 1,
37223722
"drop-initial-after-adjust" : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
37233723
"drop-initial-after-align" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",

‎release/npm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parserlib",
3-
"version": "0.2.1",
3+
"version": "0.2.2",
44
"description": "CSSLint",
55
"author": "Nicholas C. Zakas",
66
"contributors": [

‎release/parserlib-core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
24+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
2525
var parserlib = {};
2626
(function(){
2727

‎release/parserlib-css.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
24+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
2525
(function(){
2626
var EventTarget = parserlib.util.EventTarget,
2727
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -1652,7 +1652,7 @@ Parser.prototype = function(){
16521652
while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
16531653
Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
16541654
Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
1655-
Tokens.RESOLUTION])){
1655+
Tokens.RESOLUTION, Tokens.SLASH])){
16561656

16571657
value += tokenStream.token().value;
16581658
value += this._readWhitespace();
@@ -2598,7 +2598,7 @@ var Properties = {
25982598
"-o-animation-name" : { multi: "none | <ident>", comma: true },
25992599
"-o-animation-play-state" : { multi: "running | paused", comma: true },
26002600

2601-
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | inherit",
2601+
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | none | inherit",
26022602
"azimuth" : function (expression) {
26032603
var simple = "<angle> | leftwards | rightwards | inherit",
26042604
direction = "left-side | far-left | left | center-left | center | center-right | right | far-right | right-side",
@@ -2807,7 +2807,7 @@ var Properties = {
28072807

28082808
//D
28092809
"direction" : "ltr | rtl | inherit",
2810-
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit",
2810+
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker",
28112811
"dominant-baseline" : 1,
28122812
"drop-initial-after-adjust" : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
28132813
"drop-initial-after-align" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",

‎release/parserlib-tests.js

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,22 @@
955955
Assert.areEqual("orientation", result.features[1].name);
956956
Assert.areEqual("portrait", result.features[1].value);
957957
Assert.areEqual("only screen and (max-device-width:768px) and (orientation:portrait)", result.text);
958+
},
959+
960+
testComplexMediaQueryWithDevicePixelRatioAsFraction: function(){
961+
var parser = new Parser();
962+
var result = parser.parseMediaQuery("only screen and (-o-device-pixel-ratio: 3/2) and (-webkit-device-pixel-ratio: 1.5)");
963+
964+
Assert.isInstanceOf(MediaQuery, result, "Result should be an instance of MediaQuery.");
965+
Assert.areEqual(1, result.line, "Line should be 1");
966+
Assert.areEqual(1, result.col, "Column should be 1");
967+
Assert.areEqual("only", result.modifier);
968+
Assert.areEqual("screen", result.mediaType);
969+
Assert.areEqual(2, result.features.length, "Should be two features.");
970+
Assert.areEqual("-o-device-pixel-ratio", result.features[0].name);
971+
Assert.areEqual("3/2", result.features[0].value);
972+
Assert.areEqual("-webkit-device-pixel-ratio", result.features[1].name);
973+
Assert.areEqual("1.5", result.features[1].value);
958974
}
959975

960976

@@ -1115,7 +1131,7 @@
11151131
Assert.areEqual(0, result.parts[0].green);
11161132
Assert.areEqual(0, result.parts[0].blue);
11171133
},
1118-
1134+
11191135
testCSS2SystemColorValue: function(){
11201136
var parser = new Parser();
11211137
var result = parser.parsePropertyValue("InfoText");
@@ -1594,6 +1610,22 @@
15941610
Assert.areEqual("-moz-pre-wrap", event.value.parts[0].text, "The vendor prefixed value should be intact.");
15951611
});
15961612
var result = parser.parse(".foo {\n; white-space: -moz-pre-wrap;\n}");
1613+
},
1614+
1615+
"Test display -moz-inline-stack": function(){
1616+
var parser = new Parser({ strict: true});
1617+
parser.addListener("property", function(event){
1618+
Assert.areEqual("display", event.property.toString());
1619+
Assert.areEqual("-moz-inline-stack", event.value.toString());
1620+
Assert.areEqual(5, event.property.col, "Property column should be 5.");
1621+
Assert.areEqual(2, event.property.line, "Property line should be 2.");
1622+
Assert.areEqual(5, event.col, "Event column should be 5.");
1623+
Assert.areEqual(2, event.line, "Event line should be 2.");
1624+
Assert.areEqual(14, event.value.parts[0].col, "First part column should be 14.");
1625+
Assert.areEqual(2, event.value.parts[0].line, "First part line should be 2.");
1626+
Assert.areEqual("-moz-inline-stack", event.value.parts[0].text, "Vendor prefixed value -moz-inline-stack is intact.");
1627+
});
1628+
var result = parser.parse(".foo {\n display: -moz-inline-stack;\n}");
15971629
}
15981630
}));
15991631

‎release/parserlib.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
24+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v0.2.1, Build time: 4-December-2012 11:58:48 */
934+
/* Version v0.2.2, Build time: 17-January-2013 10:26:34 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -2562,7 +2562,7 @@ Parser.prototype = function(){
25622562
while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
25632563
Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
25642564
Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
2565-
Tokens.RESOLUTION])){
2565+
Tokens.RESOLUTION, Tokens.SLASH])){
25662566

25672567
value += tokenStream.token().value;
25682568
value += this._readWhitespace();
@@ -3508,7 +3508,7 @@ var Properties = {
35083508
"-o-animation-name" : { multi: "none | <ident>", comma: true },
35093509
"-o-animation-play-state" : { multi: "running | paused", comma: true },
35103510

3511-
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | inherit",
3511+
"appearance" : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | none | inherit",
35123512
"azimuth" : function (expression) {
35133513
var simple = "<angle> | leftwards | rightwards | inherit",
35143514
direction = "left-side | far-left | left | center-left | center | center-right | right | far-right | right-side",
@@ -3717,7 +3717,7 @@ var Properties = {
37173717

37183718
//D
37193719
"direction" : "ltr | rtl | inherit",
3720-
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit",
3720+
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker",
37213721
"dominant-baseline" : 1,
37223722
"drop-initial-after-adjust" : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
37233723
"drop-initial-after-align" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",

0 commit comments

Comments
 (0)