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-field.reel/token-field.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-field.reel/token-field.html')
-rw-r--r-- | node_modules/montage/ui/token-field/token-field.reel/token-field.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/node_modules/montage/ui/token-field/token-field.reel/token-field.html b/node_modules/montage/ui/token-field/token-field.reel/token-field.html index 0335de13..2a2d98d4 100644 --- a/node_modules/montage/ui/token-field/token-field.reel/token-field.html +++ b/node_modules/montage/ui/token-field/token-field.reel/token-field.html | |||
@@ -9,7 +9,7 @@ | |||
9 | { | 9 | { |
10 | 10 | ||
11 | "owner": { | 11 | "owner": { |
12 | "prototype": "montage/ui/token-field/token-field.reel", | 12 | "prototype": "ui/token-field/token-field.reel", |
13 | "properties": { | 13 | "properties": { |
14 | "element": {"#": "token-field"}, | 14 | "element": {"#": "token-field"}, |
15 | "_autocomplete": {"@": "autocomplete"}, | 15 | "_autocomplete": {"@": "autocomplete"}, |
@@ -22,18 +22,18 @@ | |||
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | "tokensController": { | 24 | "tokensController": { |
25 | "prototype": "montage/ui/controller/array-controller", | 25 | "prototype": "ui/controller/array-controller", |
26 | "properties": { | 26 | "properties": { |
27 | "selectObjectsOnAddition": true, | 27 | "selectObjectsOnAddition": true, |
28 | "automaticallyOrganizeObjects": true | 28 | "automaticallyOrganizeObjects": true |
29 | }, | 29 | }, |
30 | "bindings": { | 30 | "bindings": { |
31 | "content": {"<<->": "@owner.values"} | 31 | "content": {"<->": "@owner.values"} |
32 | } | 32 | } |
33 | }, | 33 | }, |
34 | 34 | ||
35 | "tokenList": { | 35 | "tokenList": { |
36 | "prototype": "montage/ui/repetition.reel", | 36 | "prototype": "ui/repetition.reel", |
37 | "properties": { | 37 | "properties": { |
38 | "element": { | 38 | "element": { |
39 | "#": "token-list" | 39 | "#": "token-list" |
@@ -45,7 +45,7 @@ | |||
45 | }, | 45 | }, |
46 | 46 | ||
47 | "token": { | 47 | "token": { |
48 | "prototype": "montage/ui/token-field/token.reel", | 48 | "prototype": "ui/token-field/token.reel", |
49 | "properties": { | 49 | "properties": { |
50 | "element": {"#": "token"} | 50 | "element": {"#": "token"} |
51 | }, | 51 | }, |
@@ -57,7 +57,7 @@ | |||
57 | } | 57 | } |
58 | }, | 58 | }, |
59 | "autocomplete": { | 59 | "autocomplete": { |
60 | "prototype": "montage/ui/autocomplete/autocomplete.reel", | 60 | "prototype": "ui/autocomplete/autocomplete.reel", |
61 | "properties": { | 61 | "properties": { |
62 | "element": {"#": "autocomplete"}, | 62 | "element": {"#": "autocomplete"}, |
63 | "identifier": "autocomplete", | 63 | "identifier": "autocomplete", |