Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

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

1 files changed, 246 insertions, 0 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
new file mode 100644
index 00000000..6557c14e
--- /dev/null
+++ b/js/controllers/objects-controller.js
@@ -0,0 +1,246 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+var Montage = require("montage/core/core").Montage;
+
+var CATEGORIES  = {
+
+};
+
+var objectsController = exports.ObjectsController = Montage.create(Montage, {
+
+    _currentDocument : {
+        value : null,
+        enumerable : false
+    },
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(doc) {
+            if(!doc) { return false; }
+
+            // TODO: remove setTimeout when timing of montage initialization is done
+            setTimeout(function() {
+                this.bindToModelObjects();
+            }.bind(this), 1000);
+
+            this._currentDocument = doc;
+        },
+        enumerable : false
+    },
+
+    objects : {
+        value: []
+    },
+
+    _isBoundToModelObjects : {
+        value: null
+    },
+    bindToModelObjects : {
+        value: function() {
+            //// Remove any previous bindings if previously bound
+            if(!this._isBoundToModelObjects) {
+                Object.deleteBinding(this, 'objects');
+                this._isBoundToModelObjects = true;
+            }
+        }
+    },
+    
+    /* --------------------------
+          Binding Methods
+    ----------------------------- */
+    
+    addBinding : {
+        value: function(bindingArgs) {
+            if(!bindingArgs.sourceObject || !bindingArgs.sourceObjectPropertyPath || !bindingArgs) { return; }
+
+            var sourceObject = bindingArgs.sourceObject,
+                sourcePath = bindingArgs.sourceObjectPropertyPath,
+                sourceDescriptor = sourceObject._bindingDescriptors;
+
+            if(sourceDescriptor && sourceDescriptor[sourcePath]) {
+                this.removeBinding(bindingArgs);
+            }
+
+            Object.defineBinding(sourceObject, sourcePath, bindingArgs);
+            this.currentObjectBindings = this.getObjectBindings(bindingArgs.sourceObject);
+        }
+    },
+
+    removeBinding : {
+        value: function(bindingArgs) {
+            if(!bindingArgs) { return; }
+
+
+
+            Object.deleteBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath);
+            this.currentObjectBindings = this.getObjectBindings(bindingArgs.sourceObject);
+        }
+    },
+
+    editBinding : {
+        value: function(bindingArgs, newProperties) {
+            var property;
+
+            this.removeBinding(bindingArgs);
+
+            if(newProperties) {
+                for(property in newProperties) {
+                    bindingArgs[property] = newProperties[property];
+                }
+            }
+
+            this.addBinding(bindingArgs);
+
+        }
+    },
+    
+    getObjectBindings : {
+        value: function(object) {
+            var descriptors = object._bindingDescriptors,
+                bindingsArray = [],
+                property, descriptor, bindingArgsObject;
+
+            if(descriptors) {
+                for(property in descriptors) {
+                    if(descriptors.hasOwnProperty(property)) {
+                        descriptor = descriptors[property];
+
+                            bindingArgsObject = {
+                                sourceObject : object,
+                                sourceObjectPropertyPath : property,
+                                boundObject : descriptor.boundObject,
+                                boundObjectPropertyPath : descriptor.boundObjectPropertyPath,
+                                oneway : descriptor.oneway
+                            };
+
+                            bindingsArray.push(bindingArgsObject);
+                    }
+                }
+            }
+
+            return bindingsArray;
+        }
+    },
+
+    /* ---- Get Bindable Properties ---- */
+
+    getPropertyList : {
+        value: function(object, excludeUnderscoreProperties) {
+            return this.getPrototypes(object).map(function(proto) {
+
+                var metadata = proto._montage_metadata,
+                    objectName = (metadata) ? metadata.objectName : "Object";
+
+                return {
+                    category : objectName,
+                    properties : this.getPropertiesFromObject(proto)
+                };
+            }, this);
+
+        }
+    },
+
+    getPropertiesFromObject : {
+        value: function (object, excludeUnderscoreProperties) {
+            var properties = [];
+
+            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();
+        }
+    },
+
+    getPrototypes : {
+        value: function(object) {
+            var object_i = object,
+                prototypes = [object_i];
+
+            ///// Collect prototypes
+            while(Object.getPrototypeOf(object_i)) {
+                object_i = Object.getPrototypeOf(object_i);
+                prototypes.push(object_i);
+            }
+
+            return prototypes;
+        }
+    },
+
+    /* ----- Category properties ----- */
+
+    getObjectCategory : {
+        value: function(object) {
+            if(this._hasPrototype(object, 'Component')) {
+                return 'Component';
+            }
+
+            return null;
+        }
+    },
+
+    /* ----- Utils ----- */
+
+    _hasPrototype : {
+        value: function(object, prototypeName) {
+            var prototypes = this.getPrototypes(object).map(function(proto) {
+                var metadata = proto._montage_metadata;
+                return (metadata) ? metadata.objectName : "Object";
+            });
+
+            return prototypes.indexOf(prototypeName) !== -1;
+        }
+    },
+
+    ///// Returns true if the element is "non-visual", i.e. is not a component,
+    ///// and has not element property
+
+    isOffStageObject : {
+        value: function(object) {
+            var isComponent = this._hasPrototype(object, "Component"),
+                hasValidElement = object.element && object.element.parentNode;
+
+            return !isComponent || !hasValidElement;
+        }
+    },
+
+    /* ---- Bindable controller properties ---- */
+
+    currentObjectBindings : {
+        value: null
+    },
+    _currentObject : {
+        value: null
+    },
+    currentObject : {
+        get: function() {
+            return this._currentObject;
+        },
+        set: function(value) {
+            //if(value === this._currentObject) { return; }