diff options
| author | Nivesh Rajbhandari | 2012-04-18 13:49:26 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-18 13:49:26 -0700 |
| commit | e6bdea62cff68837239c1be579926693c1aa7bdf (patch) | |
| tree | bddf63c8b1fc493ec64aca642b8887321674bb16 /js | |
| parent | 7b3ef287f248c07602aefa3ba2cc907e0d16493a (diff) | |
| parent | 2e04af953463643791f6362bd8ef4c6ba190abfa (diff) | |
| download | ninja-e6bdea62cff68837239c1be579926693c1aa7bdf.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into EricMerge
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"); |