diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /js/panels/components-panel.reel | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'js/panels/components-panel.reel')
| -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"); |