diff options
author | Ananya Sen | 2012-04-23 10:53:45 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-23 10:53:45 -0700 |
commit | 6e2d8c8b7e981de2a7ede45d707614307e811cad (patch) | |
tree | 94d5455c90439548c89d811a03d675e94cf5d27c /js/panels | |
parent | 2fafe26f74f342388b97960e7a58e3f45d8d961f (diff) | |
parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
download | ninja-6e2d8c8b7e981de2a7ede45d707614307e811cad.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/components-panel.reel/components-panel.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index cfacd461..79eac37b 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
@@ -8,7 +8,6 @@ var Montage = require("montage/core/core").Montage, | |||
8 | Component = require("montage/ui/component").Component, | 8 | Component = require("montage/ui/component").Component, |
9 | NJUtils = require("js/lib/NJUtils").NJUtils; | 9 | NJUtils = require("js/lib/NJUtils").NJUtils; |
10 | 10 | ||
11 | var treeControlModule = require("js/components/tree.reel"); | ||
12 | var PIData = require("js/data/pi/pi-data").PiData; | 11 | var PIData = require("js/data/pi/pi-data").PiData; |
13 | 12 | ||
14 | String.prototype.capitalizeFirstChar = function() { | 13 | String.prototype.capitalizeFirstChar = function() { |
@@ -367,7 +366,7 @@ exports.ComponentsPanel = Montage.create(Component, { | |||
367 | break; | 366 | break; |
368 | case "textarea": | 367 | case "textarea": |
369 | el = NJUtils.makeNJElement("textarea", "TextArea", "component"); | 368 | el = NJUtils.makeNJElement("textarea", "TextArea", "component"); |
370 | el.elementModel.pi = "TextAreaPi"; | 369 | el.elementModel.pi = "TextareaPi"; |
371 | break; | 370 | break; |
372 | case "toggleButton": | 371 | case "toggleButton": |
373 | el = NJUtils.makeNJElement("button", "Toggle Button", "component"); | 372 | el = NJUtils.makeNJElement("button", "Toggle Button", "component"); |