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/bluemoon/textfield.reel | |
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/bluemoon/textfield.reel')
-rw-r--r-- | node_modules/montage/ui/bluemoon/textfield.reel/textfield.html | 8 | ||||
-rw-r--r-- | node_modules/montage/ui/bluemoon/textfield.reel/textfield.js | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.html b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.html index 4175d1d3..25618843 100644 --- a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.html +++ b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.html | |||
@@ -6,11 +6,9 @@ | |||
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> | 9 | <meta charset="utf-8"> |
10 | <link rel="stylesheet" type="text/css" href="textfield.css"> | 10 | <link rel="stylesheet" href="textfield.css"> |
11 | |||
12 | </head> | 11 | </head> |
13 | <body> | 12 | <body> |
14 | |||
15 | </body> | 13 | </body> |
16 | </html> | 14 | </html> \ No newline at end of file |
diff --git a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js index 6de3d636..eb8e482f 100644 --- a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js +++ b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js | |||
@@ -4,17 +4,17 @@ | |||
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 | @module "montage/ui/bluemoon/textfield.reel" | 7 | @module "montage/ui/bluemoon/input-text.reel" |
8 | @requires montage/core/core | 8 | @requires montage/core/core |
9 | @requires montage/ui/editable-text | 9 | @requires montage/ui/editable-text |
10 | */ | 10 | */ |
11 | var Montage = require("montage").Montage, | 11 | var Montage = require("montage").Montage, |
12 | EditableText = require("ui/editable-text").EditableText; | 12 | EditableText = require("ui/editable-text").EditableText; |
13 | /** | 13 | /** |
14 | @class module:"montage/ui/bluemoon/textfield.reel".Textfield | 14 | @class module:"montage/ui/bluemoon/input-text.reel".Textfield |
15 | @extends module:montage/ui/editable-text.EditableText | 15 | @extends module:montage/ui/editable-text.EditableText |
16 | */ | 16 | */ |
17 | var Textfield = exports.Textfield = Montage.create(EditableText,/** @lends module:"montage/ui/bluemoon/textfield.reel".Textfield# */ { | 17 | var Textfield = exports.Textfield = Montage.create(EditableText,/** @lends module:"montage/ui/bluemoon/input-text.reel".Textfield# */ { |
18 | /** | 18 | /** |
19 | Description TODO | 19 | Description TODO |
20 | @type {Property} | 20 | @type {Property} |