archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

regenerate package-lock and run prettier

Browse Source
This commit is contained in:
Michael Rawlings 2018-12-11 13:06:59 -08:00
parent 5ea9eaa657
commit 3afd7d4264
No known key found for this signature in database
GPG Key ID: 95A877250FE4F1FA
19 changed files with 1236 additions and 1409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CHANGELOG.md
View File

@ -1290,15 +1290,9 @@ Example usage:
```html
<ui-tabs orientation="horizontal">
<ui-tabs.tab title="Home">
Content for Home
</ui-tabs.tab>
<ui-tabs.tab title="Profile">
Content for Profile
</ui-tabs.tab>
<ui-tabs.tab title="Messages">
Content for Messages
</ui-tabs.tab>
<ui-tabs.tab title="Home"> Content for Home </ui-tabs.tab>
<ui-tabs.tab title="Profile"> Content for Profile </ui-tabs.tab>
<ui-tabs.tab title="Messages"> Content for Messages </ui-tabs.tab>
</ui-tabs>
```
@ -1351,18 +1345,16 @@ exports.renderer = function(input, out) {
```html
<div class="tabs">
<ul class="nav nav-tabs">
<li class="tab" for="tab in data.tabs">
<a href="#${tab.title}">
${tab.title}
</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane" for="tab in data.tabs">
<invoke function="tab.renderBody(out)"/>
</div>
<ul class="nav nav-tabs">
<li class="tab" for="tab in data.tabs">
<a href="#${tab.title}"> ${tab.title} </a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane" for="tab in data.tabs">
<invoke function="tab.renderBody(out)" />
</div>
</div>
</div>
```
@ -1485,10 +1477,7 @@ MARKO_CLEAN=true node run.js
- Fixed #35 - Added support for `<compiler-options>`. Example:
```html
<compiler-options whitespace="preserve" />
A
B
C
<compiler-options whitespace="preserve" /> A B C
```
### 2.0.0

6
benchmark/vdom/browser.json
View File

@ -6,13 +6,11 @@
},
{
"type": "js",
"url":
"https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.js"
"url": "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.js"
},
{
"type": "js",
"url":
"https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.2/benchmark.js"
"url": "https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.2/benchmark.js"
},
"benchmark/benchmark.js",
"require-run: ./client.js"

3
docs/components.md
View File

@ -406,8 +406,7 @@ The `:scoped` modifier on an attribute allows you to reference another element a
The above code will produce output HTML similar to the following:
```html
<label for="c0-name">Name</label>
<input id="c0-name" value="Frank">
<label for="c0-name">Name</label> <input id="c0-name" value="Frank" />
```
**`aria-describedby:key`**

10
docs/concise.md
View File

@ -12,9 +12,7 @@ div class="thumbnail"
_output.html_
```html
<div class="thumbnail">
<img src="https://example.com/thumb.png"/>
</div>
<div class="thumbnail"><img src="https://example.com/thumb.png" /></div>
```
## Shorthand attributes
@ -35,8 +33,7 @@ _output.html_
```html
<div class="my-class"></div>
<span id="my-id"></span>
<button id="submit" class="primary large"></button>
<span id="my-id"></span> <button id="submit" class="primary large"></button>
```
> **ProTip:** These shorthand attributes are available within the HTML syntax as well
@ -109,8 +106,7 @@ The output would be the following:
_output.html_
```html
<Hello World></Hello>
<Welcome to Marko></Welcome>
<Hello World></Hello> <Welcome to Marko></Welcome>
```
Instead, prefix the lines with `--` so they are parsed as text:

13
docs/core-tags.md
View File

@ -66,9 +66,9 @@ The output HTML would be the following:
```html
<ul>
<li>red</li>
<li>green</li>
<li>blue</li>
<li>red</li>
<li>green</li>
<li>blue</li>
</ul>
```
@ -514,10 +514,7 @@ _output.html_
```html
<div>
This is just one
&lt;span if(foo)&gt;
Hello ${THIS IS NOT VALID}!
&lt;/span&gt;
big text block
This is just one &lt;span if(foo)&gt; Hello ${THIS IS NOT VALID}!
&lt;/span&gt; big text block
</div>
```

16
docs/lasso.md
View File

@ -40,14 +40,14 @@ After installing, the lasso custom tags can be used in your templates:
```html
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Marko + Lasso</title>
<lasso-head/>
</head>
<body>
<lasso-body/>
</body>
<head>
<meta charset="UTF-8" />
<title>Marko + Lasso</title>
<lasso-head />
</head>
<body>
<lasso-body />
</body>
</html>
```

7
docs/marko-v4.md
View File

@ -649,9 +649,10 @@ template.render({}, function(err, html, out) {});
**New:**
```js
template.render({})
.then(function(result){})
.catch(function(err) {});
template
.render({})
.then(function(result) {})
.catch(function(err) {});
// render() can now be used with async/await
var out = await template.render({});

6
docs/syntax.md
View File

@ -130,8 +130,7 @@ In Marko, if an attribute value expression evaluates to `null` or `false` then t
Would render to the following HTML:
```html
<input type="checkbox" checked>
<input type="checkbox">
<input type="checkbox" checked /> <input type="checkbox" />
```
#### Conditional attributes
@ -242,8 +241,7 @@ _output.html_
```html
<div class="my-class"></div>
<span id="my-id"></span>
<button id="submit" class="primary large"></button>
<span id="my-id"></span> <button id="submit" class="primary large"></button>
```
## Directives

6
docs/webpack.md
View File

@ -62,11 +62,11 @@ Run `webpack` from your terminal and you'll have a new `static/bundle.js` file c
_index.html_
```html
<!doctype html>
<!DOCTYPE html>
<html>
<body>
<body>
<script src="static/bundle.js"></script>
</body>
</body>
</html>
```

2273
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
src/compiler/Migrator.js
View File

@ -45,13 +45,13 @@ function migrateTreeHelper(node, context) {
migrateNode(node, context);
/*
* Now process the child nodes by looping over the child nodes
* and migrating the subtree recursively
*
* NOTE: The length of the childNodes array might change as the tree is being performed.
* The checks to prevent migrators from being applied multiple times makes
* sure that this is not a problem.
*/
* Now process the child nodes by looping over the child nodes
* and migrating the subtree recursively
*
* NOTE: The length of the childNodes array might change as the tree is being performed.
* The checks to prevent migrators from being applied multiple times makes
* sure that this is not a problem.
*/
node.forEachChild(function(childNode) {
migrateTreeHelper(childNode, context);

24
src/components/taglib/marko.json
View File

@ -29,12 +29,10 @@
{
"displayText": "key=\"<method>\"",
"snippet": "key=\"${1:method}\"",
"descriptionMoreURL":
"http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
"descriptionMoreURL": "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
"descriptionMoreURL": "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
}
]
},
@ -74,8 +72,7 @@
{
"displayText": "on<event>(\"<method>\")",
"snippet": "on${1:Click}(\"handle${2:Button}${1:Click}\")",
"descriptionMoreURL":
"https://markojs.com/docs/components/#attaching-dom-event-listeners"
"descriptionMoreURL": "https://markojs.com/docs/components/#attaching-dom-event-listeners"
}
]
},
@ -88,8 +85,7 @@
"autocomplete": {
"displayText": "once<event>(\"<method>\")",
"snippet": "once${1:Click}(\"handle${2:Button}${1:Click}\")",
"descriptionMoreURL":
"https://markojs.com/docs/components/#attaching-dom-event-listeners"
"descriptionMoreURL": "https://markojs.com/docs/components/#attaching-dom-event-listeners"
}
},
"@w-on*": {
@ -134,8 +130,7 @@
"preserve-name": true,
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
"descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
}
]
},
@ -144,8 +139,7 @@
"preserve-name": true,
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
"descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
}
]
},
@ -154,8 +148,7 @@
"autocomplete": [
{
"snippet": "no-update-if(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
"descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
}
]
},
@ -164,8 +157,7 @@
"autocomplete": [
{
"snippet": "no-update-body-if(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
"descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
}
]
},

4
src/runtime/vdom/VElement.js
View File

@ -268,8 +268,8 @@ defineProperty(proto, "___value", {
? toString(value)
: this.___attributes.type === "checkbox" ||
this.___attributes.type === "radio"
? "on"
: "";
? "on"
: "";
}
});

27
src/taglibs/async/marko.json
View File

@ -39,13 +39,11 @@
"@_name": "string",
"@client-reorder": {
"type": "boolean",
"description":
"Use JavaScript on client to move async fragment into the proper place."
"description": "Use JavaScript on client to move async fragment into the proper place."
},
"@scope": {
"type": "expression",
"description":
"The value of 'this' when invoking the data provider function (N/A with promises)"
"description": "The value of 'this' when invoking the data provider function (N/A with promises)"
},
"@show-after": {
"type": "string"
@ -60,12 +58,10 @@
"autocomplete": [
{
"snippet": "await(${1:varName} from ${2:data.myDataProvider})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
}
]
},
@ -74,12 +70,10 @@
"autocomplete": [
{
"snippet": "await-reorderer",
"descriptionMoreURL":
"http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
}
]
},
@ -87,8 +81,7 @@
"transformer": "./await-nested-tag-transformer",
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-placeholder><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-placeholder><code>"
}
]
},
@ -96,8 +89,7 @@
"transformer": "./await-nested-tag-transformer",
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-timeout><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-timeout><code>"
}
]
},
@ -105,8 +97,7 @@
"transformer": "./await-nested-tag-transformer",
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-error><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-error><code>"
}
]
}

129
src/taglibs/core/marko.json
View File

@ -8,8 +8,7 @@
"attributes": {},
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
}
]
},
@ -19,13 +18,11 @@
"autocomplete": [
{
"snippet": "else-if(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
},
{
"snippet": "else-if",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
}
]
},
@ -35,33 +32,27 @@
"autocomplete": [
{
"snippet": "for(${1:var} in ${2:array})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#for"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
},
{
"snippet": "for(${1:var} in ${2:array}) | status-var=${3:loop}",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#loop-status-variable"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#loop-status-variable"
},
{
"snippet": "for(${1:name},${2:value} in ${3:object})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#property-looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#property-looping"
},
{
"snippet": "for(${1:init}; ${2:test}; ${3:update})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
},
{
"snippet": "for(${1:var} from ${2:start} to ${3:end})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#range-looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#range-looping"
},
{
"snippet": "for",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#for"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
}
]
},
@ -71,12 +62,10 @@
"autocomplete": [
{
"snippet": "if(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
}
]
},
@ -94,12 +83,10 @@
{
"displayText": "include(<template>)",
"snippet": "include(${1:\"./target.marko\"})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
}
]
},
@ -109,12 +96,10 @@
{
"displayText": "include-html(<path>)",
"snippet": "include-html(${1:\"./foo.html\"})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
}
]
},
@ -124,12 +109,10 @@
{
"displayText": "include-text(<path>)",
"snippet": "include-text(${1:\"./foo.txt\"})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
}
]
},
@ -139,12 +122,10 @@
{
"displayText": "macro <name>(<parmas>)",
"snippet": "macro ${1:name}(${2:param1, param2})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#macros"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#macros"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#macros"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#macros"
}
],
"no-output": true
@ -153,8 +134,7 @@
"code-generator": "./macro-body-tag",
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#macros",
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#macros",
"openTagOnly": true
}
]
@ -169,8 +149,7 @@
"preserve-whitespace": true,
"autocomplete": [
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#whitespace"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#whitespace"
}
]
},
@ -194,12 +173,10 @@
"autocomplete": [
{
"snippet": "unless(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
}
]
},
@ -208,12 +185,10 @@
"autocomplete": [
{
"snippet": "while(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
}
]
},
@ -223,12 +198,10 @@
"autocomplete": [
{
"snippet": "body-only-if(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#body-only-if"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#body-only-if"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#body-only-if"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#body-only-if"
}
]
},
@ -237,12 +210,10 @@
"autocomplete": [
{
"snippet": "if(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
}
]
},
@ -251,12 +222,10 @@
"autocomplete": [
{
"snippet": "else-if(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
}
]
},
@ -266,33 +235,26 @@
"autocomplete": [
{
"snippet": "for(${1:var} in ${2:array})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#for"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
},
{
"snippet":
"for(${1:var} in ${2:array}) | status-var=${3:loop}",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#loop-status-variable"
"snippet": "for(${1:var} in ${2:array}) | status-var=${3:loop}",
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#loop-status-variable"
},
{
"snippet": "for(${1:name},${2:value} in ${3:object})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#property-looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#property-looping"
},
{
"snippet": "for(${1:init}; ${2:test}; ${3:update})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
},
{
"snippet": "for(${1:var} from ${2:start} to ${3:end})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#range-looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#range-looping"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#for"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
}
]
},
@ -301,18 +263,15 @@
{
"displayText": "include(<template>)",
"snippet": "include(${1:\"./target.marko\"})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
},
{
"displayText": "include(data.renderBody)",
"snippet": "include(data.renderBody)",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#includes"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
}
]
},
@ -329,12 +288,10 @@
"autocomplete": [
{
"snippet": "while(${1:condition})",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#looping"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
}
]
},

45
src/taglibs/html/marko.json
View File

@ -23,8 +23,7 @@
},
{
"displayText": "a href=\"mailto:\"",
"snippet":
"a href=\"mailto:${1:joe@example.com}?subject=${2:feedback}\""
"snippet": "a href=\"mailto:${1:joe@example.com}?subject=${2:feedback}\""
}
],
"attribute-groups": ["html-attributes"]
@ -58,8 +57,7 @@
{},
{
"displayText": "area shape=\"\" coords=\"\" href=\"\"",
"snippet":
"area ${1:shape=\"${2:default}\"} coords=\"$3\" ${4:href=\"${5:#}\"}"
"snippet": "area ${1:shape=\"${2:default}\"} coords=\"$3\" ${4:href=\"${5:#}\"}"
}
],
"attribute-groups": ["html-attributes"]
@ -188,8 +186,7 @@
"autocomplete": [
{},
{
"snippet":
"canvas id=\"${1:canvas}\" width=\"${2:300}\" height=\"${3:300}\""
"snippet": "canvas id=\"${1:canvas}\" width=\"${2:300}\" height=\"${3:300}\""
}
],
"attribute-groups": ["html-attributes"]
@ -280,8 +277,7 @@
"autocomplete": [
{},
{
"snippet":
"embed type=\"${1:video/quicktime}\" src=\"${2:#}\" width=\"${3:300}\" height=\"${4:300}\""
"snippet": "embed type=\"${1:video/quicktime}\" src=\"${2:#}\" width=\"${3:300}\" height=\"${4:300}\""
}
],
"attribute-groups": ["html-attributes"]
@ -318,8 +314,7 @@
"autocomplete": [
{},
{
"snippet":
"form class=\"$1\" action=\"${2:index.html}\" method=\"${3:post}\""
"snippet": "form class=\"$1\" action=\"${2:index.html}\" method=\"${3:post}\""
}
],
"attribute-groups": ["html-attributes"]
@ -376,13 +371,11 @@
},
{
"displayText": "HTML page",
"snippet":
"<!DOCTYPE html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"UTF-8\">\n\t\t<title>${1:title}</title>\n\t</head>\n\t<body>\n\t\t$2\n\t</body>\n</html>\n"
"snippet": "<!DOCTYPE html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"UTF-8\">\n\t\t<title>${1:title}</title>\n\t</head>\n\t<body>\n\t\t$2\n\t</body>\n</html>\n"
},
{
"displayText": "HTML page (concise)",
"snippet":
"<!DOCTYPE html>\nhtml lang=\"en\"\n\thead\n\t\tmeta charset=\"UTF-8\"\n\t\t<title>${1:title}</title>\n\tbody\n\t\t$2\n"
"snippet": "<!DOCTYPE html>\nhtml lang=\"en\"\n\thead\n\t\tmeta charset=\"UTF-8\"\n\t\t<title>${1:title}</title>\n\tbody\n\t\t$2\n"
}
],
"attribute-groups": ["html-attributes"]
@ -460,8 +453,7 @@
"autocomplete": [
{},
{
"snippet":
"input type=\"${1}\" name=\"${2:name}\" value=\"$3\"",
"snippet": "input type=\"${1}\" name=\"${2:name}\" value=\"$3\"",
"triggerAutocompleteAfterInsert": true
}
],
@ -488,8 +480,7 @@
"autocomplete": [
{},
{
"snippet":
"keygen name=\"${1:name}\" challenge=\"${2:string}\" keytype=\"${3:RSA}\" keyparams=\"${4:medium}\""
"snippet": "keygen name=\"${1:name}\" challenge=\"${2:string}\" keytype=\"${3:RSA}\" keyparams=\"${4:medium}\""
}
],
"attribute-groups": ["html-attributes"]
@ -527,8 +518,7 @@
"autocomplete": [
{},
{
"snippet":
"link rel=\"${1:stylesheet}\" href=\"${2:/css/master.css}\" media=\"${3:screen}\" title=\"${4:no title}\" charset=\"${5:utf-8}\""
"snippet": "link rel=\"${1:stylesheet}\" href=\"${2:/css/master.css}\" media=\"${3:screen}\" title=\"${4:no title}\" charset=\"${5:utf-8}\""
},
{
"snippet": "link rel=\"icon\" href=\"$1.ico\""
@ -579,8 +569,7 @@
"autocomplete": [
{},
{
"snippet":
"meter min=\"${1:200}\" max=\"${2:500}\" value=\"${3:350}\""
"snippet": "meter min=\"${1:200}\" max=\"${2:500}\" value=\"${3:350}\""
}
],
"attribute-groups": ["html-attributes"]
@ -727,8 +716,7 @@
"autocomplete": [
{
"snippet": "script template-helpers",
"descriptionMoreURL":
"http://markojs.com/docs/marko/language-guide/#helpers"
"descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#helpers"
}
],
"@async": "#html-async",
@ -843,8 +831,7 @@
"html": true,
"autocomplete": [
{
"snippet":
"textarea name=\"${1:name}\" rows=\"${2:8}\" cols=\"${3:40}\""
"snippet": "textarea name=\"${1:name}\" rows=\"${2:8}\" cols=\"${3:40}\""
}
],
"attribute-groups": ["html-attributes"]
@ -888,8 +875,7 @@
"html": true,
"autocomplete": [
{
"snippet":
"track kind=\"${1:subtitles}\" src=\"${2:sampleSubtitles_en.srt}\" srclang=\"${3:en}\""
"snippet": "track kind=\"${1:subtitles}\" src=\"${2:sampleSubtitles_en.srt}\" srclang=\"${3:en}\""
}
],
"attribute-groups": ["html-attributes"]
@ -916,8 +902,7 @@
"autocomplete": [
{
"displayText": "video src=\"\" autoplay poster=\"\"",
"snippet":
"video src=\"${1:videofile.ogg}\" ${2:autoplay} ${3:poster=\"${4:posterimage.jpg}\"}"
"snippet": "video src=\"${1:videofile.ogg}\" ${2:autoplay} ${3:poster=\"${4:posterimage.jpg}\"}"
}
],
"attribute-groups": ["html-attributes"]

18
src/taglibs/layout/marko.json
View File

@ -10,12 +10,10 @@
"autocomplete": [
{
"snippet": "layout-use(\"${1:./path/to/template.marko}\")",
"descriptionMoreURL":
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
}
]
},
@ -26,12 +24,10 @@
"autocomplete": [
{
"snippet": "layout-put into=\"${1:name}\"",
"descriptionMoreURL":
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
}
]
},
@ -41,12 +37,10 @@
"autocomplete": [
{
"snippet": "layout-placeholder name=\"${1:name}\"",
"descriptionMoreURL":
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
},
{
"descriptionMoreURL":
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
"descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
}
]
}

4
test/__util__/domToHTML.js
View File

@ -122,8 +122,8 @@ function vdomToHTML(node, options) {
tag === "SCRIPT"
? escapeScript
: tag === "STYLE"
? escapeStyle
: escapeXml;
? escapeStyle
: escapeXml;
serializeTextHelper(curChild, escapeText);
} else {
serializeHelper(curChild);

3
test/components-pages/fixtures/preserve-transcluded-key-on-state-change/tests.js
View File

@ -13,6 +13,5 @@ describe(path.basename(__dirname), function() {
component.forceUpdate();
component.update();
expect(component.getComponent("child")).to.eql(originalChild);
}).details =
"issue #947";
}).details = "issue #947";
});