jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'highlighting/xmlrefactor' into master

Browse source 
Conflicts:
	lib/ace/ext/modelist.js
	lib/ace/mode/_test/tokens_luapage.json
This commit is contained in:
nightwing 2013-07-14 06:23:24 +04:00
commit 386f1ecade
40 changed files with 1779 additions and 1632 deletions
Download patch file Download diff file Expand all files Collapse all files

1
demo/kitchen-sink/docs/html.html
View file

@ -1,3 +1,4 @@
<!DOCTYPE html>
<html>
<head>

35
demo/kitchen-sink/docs/twig.twig
View file

@ -1,9 +1,30 @@
{% autoescape true %}
{{ var }}
{{ var|raw }} {# var won't be escaped #}
{{ var|escape }} {# var won't be doubled-escaped #}
{% endautoescape %}
<!DOCTYPE html>
<html>
<head>
<title>My Webpage</title>
</head>
<body>
<ul id="navigation">
{% for item in navigation %}
<li><a href="{{ item.href|escape }}">{{ item.caption }}</a></li>
{% endfor %}
</ul>
{{ include('twig.html', sandboxed = true) }}
{% if 1 not in [1, 2, 3] %}
{{"string #{with} \" escapes" 'another#one' }}
{# is equivalent to #}
{% if not (1 in [1, 2, 3]) %}
{% autoescape true %}
{{ var }}
{{ var|raw }} {# var won't be escaped #}
{{ var|escape }} {# var won't be doubled-escaped #}
{% endautoescape %}
{{ include('twig.html', sandboxed = true) }}
{{"string #{with} \" escapes" 'another#one' }}
<h1>My Webpage</h1>
{{ a_variable }}
</body>
</html>