diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/token-field/token.reel/token.html | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/token-field/token.reel/token.html')
-rw-r--r-- | node_modules/montage/ui/token-field/token.reel/token.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/montage/ui/token-field/token.reel/token.html b/node_modules/montage/ui/token-field/token.reel/token.html index 54ba266e..c478ef0c 100644 --- a/node_modules/montage/ui/token-field/token.reel/token.html +++ b/node_modules/montage/ui/token-field/token.reel/token.html | |||
@@ -9,7 +9,7 @@ | |||
9 | { | 9 | { |
10 | 10 | ||
11 | "tokenText": { | 11 | "tokenText": { |
12 | "prototype": "montage/ui/dynamic-text.reel", | 12 | "prototype": "ui/dynamic-text.reel", |
13 | "properties": { | 13 | "properties": { |
14 | "element": {"#": "token-text"} | 14 | "element": {"#": "token-text"} |
15 | }, | 15 | }, |
@@ -18,7 +18,7 @@ | |||
18 | } | 18 | } |
19 | }, | 19 | }, |
20 | "tokenDelete": { | 20 | "tokenDelete": { |
21 | "prototype": "montage/ui/dynamic-text.reel", | 21 | "prototype": "ui/dynamic-text.reel", |
22 | "properties": { | 22 | "properties": { |
23 | "element": {"#": "token-delete"}, | 23 | "element": {"#": "token-delete"}, |
24 | "value": "✕" | 24 | "value": "✕" |
@@ -26,7 +26,7 @@ | |||
26 | }, | 26 | }, |
27 | 27 | ||
28 | "owner": { | 28 | "owner": { |
29 | "prototype": "montage/ui/token-field/token.reel", | 29 | "prototype": "ui/token-field/token.reel", |
30 | "properties": { | 30 | "properties": { |
31 | "element": {"#": "token"}, | 31 | "element": {"#": "token"}, |
32 | "_deleteEl": {"#": "token-delete"} | 32 | "_deleteEl": {"#": "token-delete"} |