diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/ui/textfield.reel | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'node_modules/montage/ui/textfield.reel')
-rwxr-xr-x | node_modules/montage/ui/textfield.reel/textfield.css | 35 | ||||
-rwxr-xr-x | node_modules/montage/ui/textfield.reel/textfield.html | 16 | ||||
-rw-r--r--[-rwxr-xr-x] | node_modules/montage/ui/textfield.reel/textfield.js | 37 |
3 files changed, 8 insertions, 80 deletions
diff --git a/node_modules/montage/ui/textfield.reel/textfield.css b/node_modules/montage/ui/textfield.reel/textfield.css deleted file mode 100755 index 59e638bc..00000000 --- a/node_modules/montage/ui/textfield.reel/textfield.css +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .montage-textfield { | ||
8 | line-height: 1em; | ||
9 | z-index: 1; | ||
10 | cursor: pointer; | ||
11 | background-color: hsl(0, 0%, 80%); | ||
12 | border: 1px solid hsl(0, 0%, 40%); | ||
13 | padding: 5px; | ||
14 | width: 300px; | ||
15 | font-size: 1.0em; | ||
16 | } | ||
17 | |||
18 | .montage-textfield:focus { | ||
19 | background-color: hsl(0, 100%, 99%); | ||
20 | border: 2px solid hsl(0, 0%, 40%); | ||
21 | } | ||
22 | |||
23 | .montage-text-invalid { | ||
24 | border: 2px solid #E73525; | ||
25 | border-style: dashed; | ||
26 | } | ||
27 | |||
28 | .montage-error-text { | ||
29 | /*color: #E73525; | ||
30 | margin: 2px 0; | ||
31 | background-image: url(dialog_warning.png); | ||
32 | background-repeat: no-repeat; | ||
33 | padding: 5px 0 5px 32px; | ||
34 | */ | ||
35 | } | ||
diff --git a/node_modules/montage/ui/textfield.reel/textfield.html b/node_modules/montage/ui/textfield.reel/textfield.html deleted file mode 100755 index f15cf593..00000000 --- a/node_modules/montage/ui/textfield.reel/textfield.html +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
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> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <title></title> | ||
10 | <link rel="stylesheet" type="text/css" href="textfield.css"> | ||
11 | |||
12 | </head> | ||
13 | <body> | ||
14 | |||
15 | </body> | ||
16 | </html> | ||
diff --git a/node_modules/montage/ui/textfield.reel/textfield.js b/node_modules/montage/ui/textfield.reel/textfield.js index e90e20c6..b16e685b 100755..100644 --- a/node_modules/montage/ui/textfield.reel/textfield.js +++ b/node_modules/montage/ui/textfield.reel/textfield.js | |||
@@ -3,36 +3,15 @@ | |||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
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 | /** | ||
7 | @module "montage/ui/textfield.reel" | ||
8 | @requires montage/core/core | ||
9 | @requires montage/ui/editable-text | ||
10 | */ | ||
11 | var Montage = require("montage").Montage, | 6 | var Montage = require("montage").Montage, |
12 | EditableText = require("ui/editable-text").EditableText; | 7 | Component = require("ui/component").Component, |
13 | /** | 8 | TextInput = require("ui/text-input").TextInput, |
14 | @class module:"montage/ui/textfield.reel".Textfield | 9 | StandardInputAttributes = require("ui/text-input").StandardInputAttributes; |
15 | @extends module:montage/ui/editable-text.EditableText | ||
16 | */ | ||
17 | var Textfield = exports.Textfield = Montage.create(EditableText,/** @lends module:"montage/ui/textfield.reel".Textfield# */ { | ||
18 | /** | ||
19 | Description TODO | ||
20 | @type {Property} | ||
21 | @default null | ||
22 | */ | ||
23 | delegate: { | ||
24 | enumerable: true, | ||
25 | value: null | ||
26 | }, | ||
27 | /** | 10 | /** |
28 | Description TODO | 11 | * The Text input |
29 | @private | 12 | */ |
30 | */ | 13 | var Textfield = exports.Textfield = Montage.create(TextInput, { |
31 | _drawSpecific: { | ||
32 | enumerable: false, | ||
33 | value: function() { | ||
34 | this.element.classList.add('montage-textfield'); | ||
35 | } | ||
36 | } | ||
37 | }); | 14 | }); |
38 | 15 | ||
16 | // Standard <input> tag attributes - http://www.w3.org/TR/html5/the-input-element.html#the-input-element | ||
17 | Textfield.addAttributes(StandardInputAttributes); | ||