diff options
| author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
| commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
| tree | d07aaf646091ddf9dad5b030a7905055fd323490 /js | |
| parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
| download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz | |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js')
| -rwxr-xr-x | js/panels/components-panel.reel/components-panel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index cfacd461..5d3c0a73 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
| @@ -367,7 +367,7 @@ exports.ComponentsPanel = Montage.create(Component, { | |||
| 367 | break; | 367 | break; |
| 368 | case "textarea": | 368 | case "textarea": |
| 369 | el = NJUtils.makeNJElement("textarea", "TextArea", "component"); | 369 | el = NJUtils.makeNJElement("textarea", "TextArea", "component"); |
| 370 | el.elementModel.pi = "TextAreaPi"; | 370 | el.elementModel.pi = "TextareaPi"; |
| 371 | break; | 371 | break; |
| 372 | case "toggleButton": | 372 | case "toggleButton": |
| 373 | el = NJUtils.makeNJElement("button", "Toggle Button", "component"); | 373 | el = NJUtils.makeNJElement("button", "Toggle Button", "component"); |