Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding

9 files changed, 401 insertions, 1 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
new file mode 100644
index 00000000..70a3974c
--- /dev/null
+++ b/js/controllers/objects-controller.js
@@ -0,0 +1,59 @@
+/* <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,
+    Component        = require("montage/ui/component").Component;
+
+var objectsController = exports.ObjectsController = Montage.create(Component, {
+    objects : {
+        value: []
+    },
+
+    handleAppLoaded : {
+        value: function() {
+            ///// Bind app's activeDocument property to
+            ///// objects controller's _activeDocument property
+
+            Object.defineBinding(this, "activeDocument", {
+                boundObject: this.application.ninja,
+                boundObjectPropertyPath: "currentDocument",
+                oneway: true
+            });
+        }
+    },
+
+    deserializedFromTemplate : {
+        value: function() {
+            this.eventManager.addEventListener( "appLoaded", this, false);
+        },
+        enumerable : false
+    },
+
+    _activeDocument : {
+        value : null,
+        enumerable : false
+    },
+
+    activeDocument : {
+        get : function() {
+            return this._activeDocument;
+        },
+        set : function(document) {
+            ///// If the document is null set default stylesheets to null
+            if(!document) { return false; }
+
+            setTimeout(function() {
+                this.objects = document._document.application._template._deserializer.getObjectsFromLastDeserialization();
+            }.bind(this), 1000);
+
+
+            ///// setting document via binding
+            this._activeDocument = document;
+        },
+        enumerable : false
+    }
+
+});
\ No newline at end of file
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 38fa3426..37957892 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -136,7 +136,7 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            modulePath: "js/panels/objects.reel",
+            modulePath: "js/panels/objects/objects-panel.reel",
             moduleName: "ObjectsPanel"
         }
     ]
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 52a6daa2..7c3bc2c4 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -321,6 +321,10 @@
                 "prototype": "js/controllers/code-editor-controller"
             },
 
+            "objectsController" : {
+                "prototype": "js/controllers/objects-controller"
+            },
+
             "owner": {
                 "prototype": "js/ninja.reel",
                 "properties": {
@@ -350,6 +354,7 @@
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
                     "codeEditorController": {"@": "codeEditorController"},
+                    "objectsController":    {"@": "objectsController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
                     "panelSplitter":        {"@": "splitter3"},
                     "timelineSplitter":     {"@": "splitter4"},
diff --git a/js/panels/objects/object.reel/object.css b/js/panels/objects/object.reel/object.css
new file mode 100644
index 00000000..6ca759ba
--- /dev/null
+++ b/js/panels/objects/object.reel/object.css
@@ -0,0 +1,28 @@
+/* <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> */
+
+/*
+
+<section data-montage-id="objects-panel" class="objects-panel">
+    <ul data-montage-id="list" class="objects-list">
+        <li data-montage-id="list-item" class="list-item"></li>
+    </ul>
+</section>
+
+*/
+
+.objects-list {
+    margin: 0;
+    padding: 0;
+}
+.objects-list list-item {
+    width: 200px;
+    height: 200px;
+    float: left;
+    margin:  0 18px 18px;
+    border-radius: 20px;
+    box-shadow: inset 0 0 4px rgba(0,0,0,0.5);
+}
\ No newline at end of file
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html
new file mode 100644
index 00000000..efc66d79
--- /dev/null
+++ b/js/panels/objects/object.reel/object.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!-- <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> -->
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" type="text/css" href="object.css">
+
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "prototype": "js/panels/objects/object.reel",
+                "properties": {
+                    "element": {"#": "object"}
+                }
+            },
+            "labelText": {
+                "prototype": "montage/ui/dynamic-text.reel",
+                "properties": {
+                    "element": {"#": "label" }
+                },
+                "bindings": {
+                    "value" : {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "label",
+                        "oneway": true
+                    }
+                }
+            }
+
+        }
+    </script>
+
+</head>
+<body>
+
+
+<li data-montage-id="object">
+    <div class="object-icon"></div>
+    <span data-montage-id="label" class="object-label"></span>
+</li>
+
+</body>
+</html>
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js
new file mode 100644
index 00000000..953c1baf
--- /dev/null
+++ b/js/panels/objects/object.reel/object.js
@@ -0,0 +1,101 @@
+/* <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> */
+
+/**
+ @requires montage/core/core
+ @requires montage/ui/component
+ */
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.Object = Montage.create(Component, {
+    _needsPropertyInspection : { value: null },
+
+    _sourceObject : { value: null },
+    sourceObject : {
+        get: function() {
+            return this._sourceObject;
+        },
+        set: function(object) {
+            if(this._sourceObject === object) { return false; }
+
+            if(object._montage_metadata) {
+                this.montageMetaData = object._montage_metadata;
+            }
+
+            this._needsPropertyInspection = this.needsDraw = true;
+        }
+
+    },
+
+    _identifier : {
+        value: null
+    },
+    identifier : {