Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove !!! #1270

Merged
merged 5 commits into from
Nov 11, 2013
Merged

Remove !!! #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9ed224
Remove !!! as a shorthand for doctype
Oct 24, 2013
caa7141
Update tests for `doctype`
Oct 24, 2013
bd188ae
Remove `5` as a shorthand for `html`
Oct 24, 2013
d30c066
Update tests for `doctype html` not `doctype 5`
Oct 24, 2013
7b34782
Throw proper errors for `!!! 5` deprecation
Nov 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ Compiler.prototype = {

setDoctype: function(name){
name = name || 'default';
if (name.toLowerCase() === '5') {
throw new Error('`doctype 5` is deprecated, you must now use `doctype html`');
}
this.doctype = doctypes[name.toLowerCase()] || '<!DOCTYPE ' + name + '>';
this.terse = this.doctype.toLowerCase() == '<!doctype html>';
this.xml = 0 == this.doctype.indexOf('<?xml');
Expand Down
3 changes: 1 addition & 2 deletions lib/doctypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

module.exports = {
'5': '<!DOCTYPE html>'
, 'default': '<!DOCTYPE html>'
'default': '<!DOCTYPE html>'
, 'xml': '<?xml version="1.0" encoding="utf-8" ?>'
, 'transitional': '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
, 'strict': '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
Expand Down
5 changes: 4 additions & 1 deletion lib/lexer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,10 @@ Lexer.prototype = {
*/

doctype: function() {
return this.scan(/^(?:!!!|doctype) *([^\n]+)?/, 'doctype');
if (this.scan(/^!!! *([^\n]+)?/, 'doctype')) {
throw new Error('`!!!` is deprecated, you must now use `doctype`');
}
return this.scan(/^(?:doctype) *([^\n]+)?/, 'doctype');
},

/**
Expand Down
2 changes: 1 addition & 1 deletion test/cases/doctype.default.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!!!
doctype
html
body
h1 Title
2 changes: 1 addition & 1 deletion test/cases/escape-test.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!!! 5
doctype html
html
head
title escape-test
Expand Down
2 changes: 1 addition & 1 deletion test/cases/html5.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
doctype 5
doctype html
input(type='checkbox', checked)
input(type='checkbox', checked=true)
input(type='checkbox', checked=false)
12 changes: 12 additions & 0 deletions test/error.reporting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,16 @@ describe('error reporting', function () {
});
});
});
describe('deprecated features', function () {
it('deprecates `!!!` in favour of `doctype`', function () {
var err = getError('!!! 5', {filename: 'test.jade'})
assert(/test\.jade:1/.test(err.message))
assert(/`!!!` is deprecated, you must now use `doctype`/.test(err.message))
});
it('deprecates `doctype 5` in favour of `doctype html`', function () {
var err = getError('doctype 5', {filename: 'test.jade'})
assert(/test\.jade:1/.test(err.message))
assert(/`doctype 5` is deprecated, you must now use `doctype html`/.test(err.message))
});
});
});
14 changes: 7 additions & 7 deletions test/jade.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ describe('jade', function(){

describe('.compile()', function(){
it('should support doctypes', function(){
assert.equal('<?xml version="1.0" encoding="utf-8" ?>', jade.render('!!! xml'));
assert.equal('<?xml version="1.0" encoding="utf-8" ?>', jade.render('doctype xml'));
assert.equal('<!DOCTYPE html>', jade.render('doctype html'));
assert.equal('<!DOCTYPE foo bar baz>', jade.render('doctype foo bar baz'));
assert.equal('<!DOCTYPE html>', jade.render('!!! 5'));
assert.equal('<!DOCTYPE html>', jade.render('!!!', { doctype:'html' }));
assert.equal('<!DOCTYPE html>', jade.render('!!! html', { doctype:'xml' }));
assert.equal('<!DOCTYPE html>', jade.render('doctype html'));
assert.equal('<!DOCTYPE html>', jade.render('doctype', { doctype:'html' }));
assert.equal('<!DOCTYPE html>', jade.render('doctype html', { doctype:'xml' }));
assert.equal('<html></html>', jade.render('html'));
assert.equal('<!DOCTYPE html><html></html>', jade.render('html', { doctype:'html' }));
assert.equal('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN>', jade.render('doctype html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN'));
Expand Down Expand Up @@ -349,9 +349,9 @@ describe('jade', function(){
});

it('should support test html 5 mode', function(){
assert.equal('<!DOCTYPE html><input type="checkbox" checked>', jade.render('!!! 5\ninput(type="checkbox", checked)'));
assert.equal('<!DOCTYPE html><input type="checkbox" checked>', jade.render('!!! 5\ninput(type="checkbox", checked=true)'));
assert.equal('<!DOCTYPE html><input type="checkbox">', jade.render('!!! 5\ninput(type="checkbox", checked= false)'));
assert.equal('<!DOCTYPE html><input type="checkbox" checked>', jade.render('doctype html\ninput(type="checkbox", checked)'));
assert.equal('<!DOCTYPE html><input type="checkbox" checked>', jade.render('doctype html\ninput(type="checkbox", checked=true)'));
assert.equal('<!DOCTYPE html><input type="checkbox">', jade.render('doctype html\ninput(type="checkbox", checked= false)'));
});

it('should support multi-line attrs', function(){
Expand Down