1 files changed, 39 insertions, 39 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 14213d56..ee203336 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -94,15 +94,15 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
                     if(descriptors.hasOwnProperty(property)) {
                         descriptor = descriptors[property];
 
-                        bindingArgsObject = {
-                            sourceObject : object,
-                            sourceObjectPropertyPath : property,
-                            boundObject : descriptor.boundObject,
-                            boundObjectPropertyPath : descriptor.boundObjectPropertyPath,
-                            oneway : descriptor.oneway
-                        };
-
-                        bindingsArray.push(bindingArgsObject);
+                            bindingArgsObject = {
+                                sourceObject : object,
+                                sourceObjectPropertyPath : property,
+                                boundObject : descriptor.boundObject,
+                                boundObjectPropertyPath : descriptor.boundObjectPropertyPath,
+                                oneway : descriptor.oneway
+                            };
+
+                            bindingsArray.push(bindingArgsObject);
                     }
                 }
             }
@@ -113,46 +113,46 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
 
     /* ---- Bindable Properties ---- */
 
-    getPropertiesList : {
-        value: function(object, groupByPrototype) {
+    getPropertyList : {
+        value: function(object, excludeUnderscoreProperties) {
             var object_i = object,
-                prototypes = [object_i],
-                list;
-
-            if(groupByPrototype) {
-                ///// Collect prototypes
-                while(Object.getPrototypeOf(object_i)) {
-                    object_i = Object.getPrototypeOf(object_i);
-                    prototypes.push(object_i);
-                }
-
-                list = prototypes.map(function(proto) {
-                    var metadata = proto._montage_metadata,
-                        objectName = (metadata) ? metadata.objectName : "Object";
+                prototypes = [object_i];
 
-                    return {
-                        category : objectName,
-                        properties : Montage.getSerializablePropertyNames(proto)
-                    };
-                }, this);
-            } else {
-                list = Montage.getSerializablePropertyNames(object);
+            ///// Collect prototypes
+            while(Object.getPrototypeOf(object_i)) {
+                object_i = Object.getPrototypeOf(object_i);
+                prototypes.push(object_i);
             }
 
+            return prototypes.map(function(proto) {
+
+                var metadata = proto._montage_metadata,
+                    objectName = (metadata) ? metadata.objectName : "Object";
 
-            return list;
+                return {
+                    category : objectName,
+                    properties : this.getPropertiesFromObject(proto)
+                };
+            }, this);
 
         }
     },
 
-    getBindablePropertiesFromObject : {
-        value: function (object) {
-            var serializableProperties = Montage.getSerializablePropertyNames(object),
-                properties;
+    getPropertiesFromObject : {
+        value: function (object, excludeUnderscoreProperties) {
+            var properties = [];
 
-            properties = serializableProperties.filter(function(prop) {
-                return object.hasOwnProperty(prop);
-            }, this);
+            for(var key in object) {
+                if(object.hasOwnProperty(key)) {
+                        properties.push(key);
+                }
+            }
+
+            if(excludeUnderscoreProperties) {
+                properties = properties.filter(function(property) {
+                    return property[0] !== '_';
+                }, this);
+            }
 
             return properties.sort();
         }