aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorhwc4872012-06-04 09:15:12 -0700
committerhwc4872012-06-04 09:15:12 -0700
commit3f5351c5d75080727953caf5d8d9a312c1c9391b (patch)
treedcbc2db4e137e115b43a6117331ed1176f85904b /js/panels
parent4aacbf5d3c7a42a3621eb3ae2723542a455e7720 (diff)
parent3abba04025dbc0daadb08184833a2558c442b8e1 (diff)
downloadninja-3f5351c5d75080727953caf5d8d9a312c1c9391b.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 3ad1763d..5a9d2ca5 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -40,11 +40,6 @@ exports.ComponentsPanel = Montage.create(Component, {
40 "component": "picasa-carousel" 40 "component": "picasa-carousel"
41 }, 41 },
42 { 42 {
43 "text": "Search Bar",
44 "dataFile" : "node_modules/components-data/searchfield.json",
45 "component": "searchfield"
46 },
47 {
48 "text": "Youtube Channel", 43 "text": "Youtube Channel",
49 "dataFile" : "node_modules/components-data/youtube-channel.json", 44 "dataFile" : "node_modules/components-data/youtube-channel.json",
50 "component": "youtube-channel" 45 "component": "youtube-channel"
@@ -351,7 +346,6 @@ exports.ComponentsPanel = Montage.create(Component, {
351 el.setAttribute("type", "range"); 346 el.setAttribute("type", "range");
352 break; 347 break;
353 case "textfield": 348 case "textfield":
354 case "searchfield":
355 el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument); 349 el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument);
356 document.application.njUtils.createModelForComponent(el, "Textfield"); 350 document.application.njUtils.createModelForComponent(el, "Textfield");
357 el.setAttribute("type", "text"); 351 el.setAttribute("type", "text");