Skip to content

Commit ff0e720

Browse files
nzakasnzakas
committed
Merge pull request #42 from nschonni/white-space-vendor-prefixes
Add white-space vendor prefixed values
2 parents 54e11e1 + 5acd9b2 commit ff0e720

File tree

8 files changed

+45
-13
lines changed

8 files changed

+45
-13
lines changed

‎build/node-parserlib.js

Lines changed: 3 additions & 3 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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
24+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
934+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -3933,7 +3933,7 @@ var Properties = {
39333933
"volume" : 1,
39343934

39353935
//W
3936-
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit",
3936+
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit | -pre-wrap | -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap", //http://perishablepress.com/wrapping-content/
39373937
"white-space-collapse" : 1,
39383938
"widows" : "<integer> | inherit",
39393939
"width" : "<length> | <percentage> | auto | inherit" ,

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

Lines changed: 3 additions & 3 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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
24+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
934+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -3933,7 +3933,7 @@ var Properties = {
39333933
"volume" : 1,
39343934

39353935
//W
3936-
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit",
3936+
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit | -pre-wrap | -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap", //http://perishablepress.com/wrapping-content/
39373937
"white-space-collapse" : 1,
39383938
"widows" : "<integer> | inherit",
39393939
"width" : "<length> | <percentage> | auto | inherit" ,

‎build/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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
24+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
2525
var parserlib = {};
2626
(function(){
2727

‎build/parserlib-css.js

Lines changed: 2 additions & 2 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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
24+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
2525
(function(){
2626
var EventTarget = parserlib.util.EventTarget,
2727
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -3023,7 +3023,7 @@ var Properties = {
30233023
"volume" : 1,
30243024

30253025
//W
3026-
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit",
3026+
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit | -pre-wrap | -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap", //http://perishablepress.com/wrapping-content/
30273027
"white-space-collapse" : 1,
30283028
"widows" : "<integer> | inherit",
30293029
"width" : "<length> | <percentage> | auto | inherit" ,

‎build/parserlib-tests.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,6 +1578,22 @@
15781578
Assert.areEqual(2, event.value.parts[0].line, "First part line should be 2.");
15791579
});
15801580
var result = parser.parse(".foo {\n; color: #fff;\n}");
1581+
},
1582+
1583+
"Test rule vendor prefix value": function(){
1584+
var parser = new Parser({ strict: true});
1585+
parser.addListener("property", function(event){
1586+
Assert.areEqual("white-space", event.property.toString());
1587+
Assert.areEqual("-moz-pre-wrap", event.value.toString());
1588+
Assert.areEqual(5, event.property.col, "Property column should be 5.");
1589+
Assert.areEqual(2, event.property.line, "Property line should be 2.");
1590+
Assert.areEqual(5, event.col, "Event column should be 5.");
1591+
Assert.areEqual(2, event.line, "Event line should be 2.");
1592+
Assert.areEqual(18, event.value.parts[0].col, "First part column should be 18.");
1593+
Assert.areEqual(2, event.value.parts[0].line, "First part line should be 2.");
1594+
Assert.areEqual("-moz-pre-wrap", event.value.parts[0].text, "The vendor prefixed value should be intact.");
1595+
});
1596+
var result = parser.parse(".foo {\n; white-space: -moz-pre-wrap;\n}");
15811597
}
15821598
}));
15831599

‎build/parserlib.js

Lines changed: 3 additions & 3 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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
24+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
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 v@VERSION@, Build time: 19-November-2012 08:31:03 */
934+
/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -3933,7 +3933,7 @@ var Properties = {
39333933
"volume" : 1,
39343934

39353935
//W
3936-
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit",
3936+
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit | -pre-wrap | -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap", //http://perishablepress.com/wrapping-content/
39373937
"white-space-collapse" : 1,
39383938
"widows" : "<integer> | inherit",
39393939
"width" : "<length> | <percentage> | auto | inherit" ,

‎src/css/Properties.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ var Properties = {
467467
"volume" : 1,
468468

469469
//W
470-
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit",
470+
"white-space" : "normal | pre | nowrap | pre-wrap | pre-line | inherit | -pre-wrap | -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap", //http://perishablepress.com/wrapping-content/
471471
"white-space-collapse" : 1,
472472
"widows" : "<integer> | inherit",
473473
"width" : "<length> | <percentage> | auto | inherit" ,

‎tests/css/Parser.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,6 +1578,22 @@
15781578
Assert.areEqual(2, event.value.parts[0].line, "First part line should be 2.");
15791579
});
15801580
var result = parser.parse(".foo {\n; color: #fff;\n}");
1581+
},
1582+
1583+
"Test rule vendor prefix value": function(){
1584+
var parser = new Parser({ strict: true});
1585+
parser.addListener("property", function(event){
1586+
Assert.areEqual("white-space", event.property.toString());
1587+
Assert.areEqual("-moz-pre-wrap", event.value.toString());
1588+
Assert.areEqual(5, event.property.col, "Property column should be 5.");
1589+
Assert.areEqual(2, event.property.line, "Property line should be 2.");
1590+
Assert.areEqual(5, event.col, "Event column should be 5.");
1591+
Assert.areEqual(2, event.line, "Event line should be 2.");
1592+
Assert.areEqual(18, event.value.parts[0].col, "First part column should be 18.");
1593+
Assert.areEqual(2, event.value.parts[0].line, "First part line should be 2.");
1594+
Assert.areEqual("-moz-pre-wrap", event.value.parts[0].text, "The vendor prefixed value should be intact.");
1595+
});
1596+
var result = parser.parse(".foo {\n; white-space: -moz-pre-wrap;\n}");
15811597
}
15821598
}));
15831599

0 commit comments

Comments
 (0)