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.

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

Rename Jade -> Pug #1201

Merged
merged 4 commits into from
Oct 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions components.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ var components = {
"title": "J",
"owner": "Golmote"
},
"jade": {
"title": "Jade",
"pug": {
"title": "Pug",
"require": "javascript",
"owner": "Golmote"
},
Expand Down
1 change: 0 additions & 1 deletion components/prism-jade.min.js

This file was deleted.

6 changes: 3 additions & 3 deletions components/prism-jade.js → components/prism-pug.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// - Add explicit support for plain text using |
// - Add support for markup embedded in plain text

Prism.languages.jade = {
Prism.languages.pug = {

// Multiline stuff should appear before the rest

Expand Down Expand Up @@ -193,6 +193,6 @@
}
}

Prism.languages.insertBefore('jade', 'filter', all_filters);
Prism.languages.insertBefore('pug', 'filter', all_filters);

}(Prism));
}(Prism));
1 change: 1 addition & 0 deletions components/prism-pug.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions examples/prism-jade.html → examples/prism-pug.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1>Jade</h1>
<p>To use this language, use the class "language-jade".</p>
<h1>Pug</h1>
<p>To use this language, use the class "language-pug".</p>

<h2>Comments</h2>
<pre><code>// Some
Expand Down Expand Up @@ -60,8 +60,8 @@ <h2>Inline JavaScript</h2>
</code></pre>

<h2>Keywords</h2>
<pre><code>include ./includes/head.jade
extends ./layout.jade
<pre><code>include ./includes/head.pug
extends ./layout.pug
block content
append head</code></pre>

Expand All @@ -81,8 +81,8 @@ <h2>Mixins</h2>

<h2>Filters</h2>
<p>Filters require the desired language to be loaded.
On this page, check CoffeeScript <strong>before</strong> checking Jade should make
On this page, check CoffeeScript <strong>before</strong> checking Pug should make
the example below work properly.</p>
<pre><code>script
:coffee
console.log 'This is coffee script'</code></pre>
console.log 'This is coffee script'</code></pre>
8 changes: 4 additions & 4 deletions plugins/autoloader/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h2>Specifying additional dependencies</h2>
containing a list of comma-separated language aliases.
</p>

<pre><code class="language-markup">&lt;pre>&lt;code class="language-jade" data-dependencies="less">
<pre><code class="language-markup">&lt;pre>&lt;code class="language-pug" data-dependencies="less">
:less
foo {
color: @red;
Expand Down Expand Up @@ -109,8 +109,8 @@ <h1>Examples</h1>
<p>Basic usage with some Perl code:</p>
<pre><code class="language-perl">my ($class, $filename) = @_;</code></pre>

<p>The Less filter used in Jade:</p>
<pre><code class="language-jade" data-dependencies="less">:less
<p>The Less filter used in Pug:</p>
<pre><code class="language-pug" data-dependencies="less">:less
foo {
color: @red;
}</code></pre>
Expand Down Expand Up @@ -201,4 +201,4 @@ <h1>Examples</h1>
</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions plugins/autoloader/prism-autoloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

// The dependencies map is built automatically with gulp
var lang_dependencies = /*languages_placeholder[*/{"javascript":"clike","actionscript":"javascript","aspnet":"markup","bison":"c","c":"clike","csharp":"clike","cpp":"c","coffeescript":"javascript","crystal":"ruby","css-extras":"css","d":"clike","dart":"clike","django":"markup","fsharp":"clike","glsl":"clike","go":"clike","groovy":"clike","haml":"ruby","handlebars":"markup","haxe":"clike","jade":"javascript","java":"clike","jolie":"clike","kotlin":"clike","less":"css","markdown":"markup","n4js":"javascript","nginx":"clike","objectivec":"c","opencl":"cpp","parser":"markup","php":"clike","php-extras":"php","processing":"clike","protobuf":"clike","qore":"clike","jsx":["markup","javascript"],"reason":"clike","ruby":"clike","sass":"css","scss":"css","scala":"java","smarty":"markup","swift":"clike","textile":"markup","twig":"markup","typescript":"javascript","vbnet":"basic","wiki":"markup"}/*]*/;
var lang_dependencies = /*languages_placeholder[*/{"javascript":"clike","actionscript":"javascript","aspnet":"markup","bison":"c","c":"clike","csharp":"clike","cpp":"c","coffeescript":"javascript","crystal":"ruby","css-extras":"css","d":"clike","dart":"clike","django":"markup","fsharp":"clike","glsl":"clike","go":"clike","groovy":"clike","haml":"ruby","handlebars":"markup","haxe":"clike","pug":"javascript","java":"clike","jolie":"clike","kotlin":"clike","less":"css","markdown":"markup","n4js":"javascript","nginx":"clike","objectivec":"c","opencl":"cpp","parser":"markup","php":"clike","php-extras":"php","processing":"clike","protobuf":"clike","qore":"clike","jsx":["markup","javascript"],"reason":"clike","ruby":"clike","sass":"css","scss":"css","scala":"java","smarty":"markup","swift":"clike","textile":"markup","twig":"markup","typescript":"javascript","vbnet":"basic","wiki":"markup"}/*]*/;

var lang_data = {};

Expand Down Expand Up @@ -195,4 +195,4 @@
}
});

}());
}());
2 changes: 1 addition & 1 deletion plugins/autoloader/prism-autoloader.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
block title

extends ./foo.jade
extends ./foo.pug

include ./bar.jade
include ./bar.pug

block append foo
append bar
Expand All @@ -14,8 +14,8 @@ prepend bar

[
["keyword", "block title"],
["keyword", "extends ./foo.jade"],
["keyword", "include ./bar.jade"],
["keyword", "extends ./foo.pug"],
["keyword", "include ./bar.pug"],
["keyword", "block append foo"],
["keyword", "append bar"],
["keyword", "block prepend foo"],
Expand All @@ -24,4 +24,4 @@ prepend bar

----------------------------------------------------

Checks for all keywords.
Checks for all keywords.