diff options
| author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
| commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
| tree | eb5585f92061975215f6d19305a8d1b76262e2fc /node_modules/components-data/searchfield.json | |
| parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
| parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
| download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@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 | ||