diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /node_modules/components-data/searchfield.json | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/components-data/searchfield.json')
| -rw-r--r-- | node_modules/components-data/searchfield.json | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/node_modules/components-data/searchfield.json b/node_modules/components-data/searchfield.json deleted file mode 100644 index 94c570d9..00000000 --- a/node_modules/components-data/searchfield.json +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | { | ||
| 2 | "component": "searchfield", | ||
| 3 | |||
| 4 | "module": "montage/ui/textfield.reel", | ||
| 5 | |||
| 6 | "name": "Textfield", | ||
| 7 | |||
| 8 | "properties": [ | ||
| 9 | { | ||
| 10 | "name": "valueBinding", | ||
| 11 | "type": "string", | ||
| 12 | "default": null | ||
| 13 | }, | ||
| 14 | { | ||
| 15 | "name": "value", | ||
| 16 | "type": "string", | ||
| 17 | "default": "" | ||
| 18 | } | ||
| 19 | ] | ||
| 20 | } \ No newline at end of file | ||