Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya

Conflicts:
	js/controllers/selection-controller.js

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

1 files changed, 0 insertions, 25 deletions

diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index aa5057a2..2422f5e7 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -19,7 +19,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: false,
             collapsed: false,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Color/colorpanelbase.reel",
             moduleName: "ColorPanelBase"
         },
@@ -32,7 +31,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: false,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/properties.reel",
             moduleName: "Properties"
         },
@@ -45,7 +43,6 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Materials/materials-library-panel.reel",
             moduleName: "MaterialsLibraryPanel"
         },
@@ -58,7 +55,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Components/ComponentsPanelBase.reel",
             moduleName: "ComponentsPanelBase"
         },
@@ -71,7 +67,6 @@ exports.PanelsData = Montage.create(Montage, {
 //            scrollable: true,
 //            collapsed: false,
 //            open: true,
-//            content: null,
 //            modulePath: "js/panels/Project/projectpanelbase.reel",
 //            moduleName: "ProjectPanelBase"
 //        },
@@ -84,7 +79,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/CSSPanel/CSSPanelBase.reel",
             moduleName: "CSSPanelBase"
         },
@@ -97,7 +91,6 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/presets/content.reel",
             moduleName: "content"
         }
@@ -118,24 +111,6 @@ exports.PanelsData = Montage.create(Montage, {
             this._panelOrder = val;
         }
     }
-
-
-    panels: {
-        get: function() {
-            var filtered = this._panels.filter(function(item) {
-                return item.open;
-            });
-
-            filtered.sort(function(a,b) {
-               a.name
-            });
-
-            return filtered;
-        },
-        set : function() {
-
-        }
-    }
     */
 
 });
\ No newline at end of file