Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

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, {
                             "component": "picasa-carousel"
                         },
                         {
-                            "text": "Search Bar",
-                            "dataFile" : "node_modules/components-data/searchfield.json",
-                            "component": "searchfield"
-                        },
-                        {
                             "text": "Youtube Channel",
                             "dataFile" : "node_modules/components-data/youtube-channel.json",
                             "component": "youtube-channel"
@@ -351,7 +346,6 @@ exports.ComponentsPanel = Montage.create(Component, {
                     el.setAttribute("type", "range");
                     break;
                 case "textfield":
-                case "searchfield":
                     el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument);
                     document.application.njUtils.createModelForComponent(el, "Textfield");
                     el.setAttribute("type", "text");