aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/token-field
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-17 22:31:44 -0700
committerValerio Virgillito2012-06-17 22:31:44 -0700
commit8fe92b94ce5e1e2857d088752d94e19db7e3d8a8 (patch)
treed84807aae0b974b5200050972dd94da6066e363b /node_modules/montage/ui/token-field
parente570fc8518cf03dd03c15982edcf17c5ba0a293d (diff)
downloadninja-8fe92b94ce5e1e2857d088752d94e19db7e3d8a8.tar.gz
montage v11 merge into ninja
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/token-field')
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.css20
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.html29
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.html16
3 files changed, 29 insertions, 36 deletions
diff --git a/node_modules/montage/ui/token-field/token-field.reel/token-field.css b/node_modules/montage/ui/token-field/token-field.reel/token-field.css
index 38f0ae49..3ccedcf4 100644
--- a/node_modules/montage/ui/token-field/token-field.reel/token-field.css
+++ b/node_modules/montage/ui/token-field/token-field.reel/token-field.css
@@ -4,37 +4,31 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6 6
7.montage-token-field { 7.montage-tokenField {
8 background: white; 8 background: white;
9 border: 1px solid #bdbdbd; 9 border: 1px solid #bdbdbd;
10 padding: 3px 5px; 10 padding: 3px 5px;
11 border-radius: 3px;
11 cursor: text; 12 cursor: text;
12} 13}
13 14
14.montage-token-field .montage-token-list { 15.montage-tokenField-list {
15 display: inline; 16 display: inline;
16} 17}
17 18
18.montage-token-field input[type="text"].montage-token-autocomplete { 19.montage-tokenField-autocomplete.montage-inputText {
19 -webkit-appearance: none; 20 -webkit-appearance: none;
20 -moz-appearance: none; 21 -moz-appearance: none;
21 border: none; 22 border: none;
22 height: 13px; 23 height: 13px;
23 margin: 3px 1px; 24 margin: 3px 1px;
25 padding: 0;
24 outline: 0; 26 outline: 0;
25 -webkit-box-shadow: none; 27 vertical-align: middle;
26 -moz-box-shadow: none;
27 box-shadow: none; 28 box-shadow: none;
28 width: 2px; 29 width: 2px;
29} 30}
30 31
31.montage-token-field input[type="text"].montage-token-autocomplete:focus { 32.montage-tokenField-autocomplete:focus {
32 width: 80%; 33 width: 80%;
33}
34
35.montage-token-field .montage-autocomplete-wrapper {
36 display: inline-block;
37 overflow: hidden;
38 margin: 0px;
39 vertical-align: middle;
40} \ No newline at end of file 34} \ No newline at end of file
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
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 c478ef0c..e12ae329 100644
--- a/node_modules/montage/ui/token-field/token.reel/token.html
+++ b/node_modules/montage/ui/token-field/token.reel/token.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>Token Template</title> 10 <link rel="stylesheet" href="token.css">
6 <link rel="stylesheet" type="text/css" href="token.css">
7
8 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
9{ 12{
10
11 "tokenText": { 13 "tokenText": {
12 "prototype": "ui/dynamic-text.reel", 14 "prototype": "ui/dynamic-text.reel",
13 "properties": { 15 "properties": {
@@ -24,7 +26,6 @@
24 "value": "✕" 26 "value": "✕"
25 } 27 }
26 }, 28 },
27
28 "owner": { 29 "owner": {
29 "prototype": "ui/token-field/token.reel", 30 "prototype": "ui/token-field/token.reel",
30 "properties": { 31 "properties": {
@@ -34,7 +35,6 @@
34 } 35 }
35} 36}
36 </script> 37 </script>
37
38</head> 38</head>
39<body> 39<body>
40 <span data-montage-id="token" class="montage-token"> 40 <span data-montage-id="token" class="montage-token">
@@ -42,4 +42,4 @@
42 <span data-montage-id="token-delete" class="montage-token-delete">✕</span> 42 <span data-montage-id="token-delete" class="montage-token-delete">✕</span>
43 </span> 43 </span>
44</body> 44</body>
45</html> 45</html> \ No newline at end of file