diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/token-field/token-field.reel/token-field.html | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.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 | 29 |
1 files changed, 14 insertions, 15 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 2a2d98d4..1db54025 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 | |||
@@ -1,13 +1,15 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
2 | <html> | 7 | <html> |
3 | <head> | 8 | <head> |
4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | 9 | <meta charset="utf-8"> |
5 | <title>TokenField Template</title> | 10 | <link rel="stylesheet" href="token-field.css"> |
6 | <link rel="stylesheet" type="text/css" href="token-field.css"> | ||
7 | |||
8 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
9 | { | 12 | { |
10 | |||
11 | "owner": { | 13 | "owner": { |
12 | "prototype": "ui/token-field/token-field.reel", | 14 | "prototype": "ui/token-field/token-field.reel", |
13 | "properties": { | 15 | "properties": { |
@@ -21,6 +23,7 @@ | |||
21 | "_autocompleteValue": {"<-": "@autocomplete.value"} | 23 | "_autocompleteValue": {"<-": "@autocomplete.value"} |
22 | } | 24 | } |
23 | }, | 25 | }, |
26 | |||
24 | "tokensController": { | 27 | "tokensController": { |
25 | "prototype": "ui/controller/array-controller", | 28 | "prototype": "ui/controller/array-controller", |
26 | "properties": { | 29 | "properties": { |
@@ -39,8 +42,7 @@ | |||
39 | "#": "token-list" | 42 | "#": "token-list" |
40 | }, | 43 | }, |
41 | "isSelectionEnabled": true, | 44 | "isSelectionEnabled": true, |
42 | "contentController": {"@": "tokensController"}, | 45 | "contentController": {"@": "tokensController"} |
43 | "orientation": "horizontal" | ||
44 | } | 46 | } |
45 | }, | 47 | }, |
46 | 48 | ||
@@ -56,6 +58,7 @@ | |||
56 | "allowAdHocValues": {"<-": "@owner.allowAdHocValues"} | 58 | "allowAdHocValues": {"<-": "@owner.allowAdHocValues"} |
57 | } | 59 | } |
58 | }, | 60 | }, |
61 | |||
59 | "autocomplete": { | 62 | "autocomplete": { |
60 | "prototype": "ui/autocomplete/autocomplete.reel", | 63 | "prototype": "ui/autocomplete/autocomplete.reel", |
61 | "properties": { | 64 | "properties": { |
@@ -71,17 +74,13 @@ | |||
71 | } | 74 | } |
72 | } | 75 | } |
73 | </script> | 76 | </script> |
74 | |||
75 | </head> | 77 | </head> |
76 | <body> | 78 | <body> |
77 | <div data-montage-id="token-field" class="montage-token-field"> | 79 | <div data-montage-id="token-field" class="montage-tokenField"> |
78 | <div data-montage-id="token-list" class="montage-token-list"> | 80 | <div data-montage-id="token-list" class="montage-tokenField-list"> |
79 | <span data-montage-id="token"></span> | 81 | <span data-montage-id="token"></span> |
80 | </div> | 82 | </div> |
81 | <span class="montage-autocomplete-wrapper"> | 83 | <input type="text" data-montage-id="autocomplete" class="montage-tokenField-autocomplete" tabindex="0"> |
82 | <input type="text" data-montage-id="autocomplete" class="montage-token-autocomplete" tabindex="0" /> | ||
83 | </span> | ||
84 | </div> | 84 | </div> |
85 | |||
86 | </body> | 85 | </body> |
87 | </html> | 86 | </html> \ No newline at end of file |