diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /node_modules/montage/ui/token-field/token.reel/token.html | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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"} |