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

6
benchmark/vdom/browser.json
View File

@ -6,13 +6,11 @@
}, },
{ {
"type": "js", "type": "js",
"url": "url": "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.js"
"https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.js"
}, },
{ {
"type": "js", "type": "js",
"url": "url": "https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.2/benchmark.js"
"https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.2/benchmark.js"
}, },
"benchmark/benchmark.js", "benchmark/benchmark.js",
"require-run: ./client.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: The above code will produce output HTML similar to the following:
```html ```html
<label for="c0-name">Name</label> <label for="c0-name">Name</label> <input id="c0-name" value="Frank" />
<input id="c0-name" value="Frank">
``` ```
**`aria-describedby:key`** **`aria-describedby:key`**

10
docs/concise.md
View File

@ -12,9 +12,7 @@ div class="thumbnail"
_output.html_ _output.html_
```html ```html
<div class="thumbnail"> <div class="thumbnail"><img src="https://example.com/thumb.png" /></div>
<img src="https://example.com/thumb.png"/>
</div>
``` ```
## Shorthand attributes ## Shorthand attributes
@ -35,8 +33,7 @@ _output.html_
```html ```html
<div class="my-class"></div> <div class="my-class"></div>
<span id="my-id"></span> <span id="my-id"></span> <button id="submit" class="primary large"></button>
<button id="submit" class="primary large"></button>
``` ```
> **ProTip:** These shorthand attributes are available within the HTML syntax as well > **ProTip:** These shorthand attributes are available within the HTML syntax as well
@ -109,8 +106,7 @@ The output would be the following:
_output.html_ _output.html_
```html ```html
<Hello World></Hello> <Hello World></Hello> <Welcome to Marko></Welcome>
<Welcome to Marko></Welcome>
``` ```
Instead, prefix the lines with `--` so they are parsed as text: 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 ```html
<ul> <ul>
<li>red</li> <li>red</li>
<li>green</li> <li>green</li>
<li>blue</li> <li>blue</li>
</ul> </ul>
``` ```
@ -514,10 +514,7 @@ _output.html_
```html ```html
<div> <div>
This is just one This is just one &lt;span if(foo)&gt; Hello ${THIS IS NOT VALID}!
&lt;span if(foo)&gt; &lt;/span&gt; big text block
Hello ${THIS IS NOT VALID}!
&lt;/span&gt;
big text block
</div> </div>
``` ```

16
docs/lasso.md
View File

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

7
docs/marko-v4.md
View File

@ -649,9 +649,10 @@ template.render({}, function(err, html, out) {});
**New:** **New:**
```js ```js
template.render({}) template
.then(function(result){}) .render({})
.catch(function(err) {}); .then(function(result) {})
.catch(function(err) {});
// render() can now be used with async/await // render() can now be used with async/await
var out = await template.render({}); 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: Would render to the following HTML:
```html ```html
<input type="checkbox" checked> <input type="checkbox" checked /> <input type="checkbox" />
<input type="checkbox">
``` ```
#### Conditional attributes #### Conditional attributes
@ -242,8 +241,7 @@ _output.html_
```html ```html
<div class="my-class"></div> <div class="my-class"></div>
<span id="my-id"></span> <span id="my-id"></span> <button id="submit" class="primary large"></button>
<button id="submit" class="primary large"></button>
``` ```
## Directives ## 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_ _index.html_
```html ```html
<!doctype html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="static/bundle.js"></script> <script src="static/bundle.js"></script>
</body> </body>
</html> </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); migrateNode(node, context);
/* /*
* Now process the child nodes by looping over the child nodes * Now process the child nodes by looping over the child nodes
* and migrating the subtree recursively * and migrating the subtree recursively
* *
* NOTE: The length of the childNodes array might change as the tree is being performed. * 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 * The checks to prevent migrators from being applied multiple times makes
* sure that this is not a problem. * sure that this is not a problem.
*/ */
node.forEachChild(function(childNode) { node.forEachChild(function(childNode) {
migrateTreeHelper(childNode, context); migrateTreeHelper(childNode, context);

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

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

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

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

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

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

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

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

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

@ -10,12 +10,10 @@
"autocomplete": [ "autocomplete": [
{ {
"snippet": "layout-use(\"${1:./path/to/template.marko}\")", "snippet": "layout-use(\"${1:./path/to/template.marko}\")",
"descriptionMoreURL": "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
}, },
{ {
"descriptionMoreURL": "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
} }
] ]
}, },
@ -26,12 +24,10 @@
"autocomplete": [ "autocomplete": [
{ {
"snippet": "layout-put into=\"${1:name}\"", "snippet": "layout-put into=\"${1:name}\"",
"descriptionMoreURL": "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
}, },
{ {
"descriptionMoreURL": "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
} }
] ]
}, },
@ -41,12 +37,10 @@
"autocomplete": [ "autocomplete": [
{ {
"snippet": "layout-placeholder name=\"${1:name}\"", "snippet": "layout-placeholder name=\"${1:name}\"",
"descriptionMoreURL": "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
"http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
}, },
{ {
"descriptionMoreURL": "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
"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" tag === "SCRIPT"
? escapeScript ? escapeScript
: tag === "STYLE" : tag === "STYLE"
? escapeStyle ? escapeStyle
: escapeXml; : escapeXml;
serializeTextHelper(curChild, escapeText); serializeTextHelper(curChild, escapeText);
} else { } else {
serializeHelper(curChild); 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.forceUpdate();
component.update(); component.update();
expect(component.getComponent("child")).to.eql(originalChild); expect(component.getComponent("child")).to.eql(originalChild);
}).details = }).details = "issue #947";
"issue #947";
}); });