diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /node_modules/components-data | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/components-data')
| -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 | ||