diff options
| author | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
| commit | fa7761eb547372f846a304d775e717a7ef1cbf35 (patch) | |
| tree | c60e59702d66cf9b74d5b65ca64918d6e655a2eb /js/panels | |
| parent | 260bc6db6273258f9a05c21d178273e1c302affb (diff) | |
| parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
| download | ninja-fa7761eb547372f846a304d775e717a7ef1cbf35.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels')
| -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"); |