9 files changed, 59 insertions, 156 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 54ff14ba..3e35ef5f 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -47,12 +47,6 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
                 Object.deleteBinding(this, 'objects');
                 this._isBoundToModelObjects = true;
             }
-
-//            Object.defineBinding(this, 'objects', {
-//                boundObject: this.currentDocument.model,
-//                boundObjectPropertyPath: 'mObjects',
-//                oneway: false
-//            });
         }
     },
     
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index fb195bd3..8ed6433e 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -47,7 +47,7 @@ exports.ToolsData = Montage.create(Montage, {
         value: 12
     },
     bindingToolIndex: {
-        value: 12
+        value: 13
     },
 
     // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index bee2e557..8fc0d82f 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -113,10 +113,7 @@
         <script type="text/montage-serialization" data-ninja-template="true">
         {
             "owner": {
-                "prototype": "main",
-                "properties": {
-                    "identifier": "testOwner"
-                }
+                "prototype": "main"
             }
         }
         </script>
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 6a6f565d..4a75a1b4 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -454,8 +454,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     initMontage: {
         value: function (scripttags) {
             var self = this;
-                //
-            //debugger;
+
                 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
                         //Initializing template with user's seriliazation
                         var template = this.iframe.contentWindow.mjsTemplate.create();
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.js b/js/panels/objects/objects-panel.reel/objects-panel.js
index a1c381a2..727a09aa 100644
--- a/js/panels/objects/objects-panel.reel/objects-panel.js
+++ b/js/panels/objects/objects-panel.reel/objects-panel.js
@@ -23,13 +23,6 @@ exports.ObjectsPanel = Montage.create(Component, {
         }
     },
 
-
-    templateDidLoad: { 
-        value: function() {
-            console.log('objects panel loaded');
-        }
-    },
-
     prepareForDraw : {
         value: function() {
 
@@ -40,14 +33,6 @@ exports.ObjectsPanel = Montage.create(Component, {
             });
 
         }
-    },
-    draw : {
-        value: function() {
-            console.log("objects panel draw");
-            if(this.objects) {
-
-            }
-        }
     }
 
 });
\ No newline at end of file
diff --git a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.css b/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.css
deleted file mode 100755
index 018448f1..00000000
--- a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* <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> */
diff --git a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.html b/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.html
deleted file mode 100755
index 10abb38d..00000000
--- a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!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="non-visual-component.css">
-
-    <script type="text/montage-serialization">
-        {
-            "owner": {
-                "prototype": "js/stage/binding-view.reel/non-visual-component.reel",
-                "properties": {
-                    "element": {"#": "nonVisualComponent"}
-                }
-            }
-        }
-    </script>
-
-</head>
-<body>
-    <div data-montage-id="nonVisualComponent" class="nonVisualComponent">Label for options</div>
-</body>
-</html>
diff --git a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.js b/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.js
deleted file mode 100755
index 2ff2e2f7..00000000
--- a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* <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.NonVisualComponent = Montage.create(Component, {
-    title: {
-        value: "value"
-    }
-});
\ No newline at end of file
diff --git a/node_modules/montage/core/event/binding.js b/node_modules/montage/core/event/binding.js
index 4206e1c2..4091fe6a 100755
--- a/node_modules/montage/core/event/binding.js
+++ b/node_modules/montage/core/event/binding.js
@@ -5,13 +5,13 @@
  </copyright> */
 
 /**
-    @module montage/core/event/binding
-    @requires montage/core/core
-    @requires montage/core/event/mutable-event
-    @requires montage/core/serializer
-    @requires montage/core/deserializer
-    @requires montage/core/event/event-manager
-*/
+ @module montage/core/event/binding
+ @requires montage/core/core
+ @requires montage/core/event/mutable-event
+ @requires montage/core/serializer
+ @requires montage/core/deserializer
+ @requires montage/core/event/event-manager
+ */
 
 var Montage = require("montage").Montage,
     ChangeNotification = require("core/change-notification").ChangeNotification,
@@ -23,14 +23,14 @@ var Montage = require("montage").Montage,
     UNDERSCORE = "_";
 
 /**
-    @class module:montage/core/event/binding.ChangeEventDispatchingArray
-*/
+ @class module:montage/core/event/binding.ChangeEventDispatchingArray
+ */
 var ChangeEventDispatchingArray = exports.ChangeEventDispatchingArray = [];
 
 /**
-    @class module:montage/core/event/binding.PropertyChangeBindingListener
-    @extends module:montage/core/core.Montage
-*/
+ @class module:montage/core/event/binding.PropertyChangeBindingListener
+ @extends module:montage/core/core.Montage
+ */
 var PropertyChangeBindingListener = exports.PropertyChangeBindingListener = Object.create(Montage, /** module:montage/core/event/binding.PropertyChangeBindingListener# */ {
 
     useCapture: {value:false, writable: true},
@@ -86,11 +86,11 @@ var PropertyChangeBindingListener = exports.PropertyChangeBindingListener = Obje
         value:function (notification) {
 
             var bindingOriginTriggeredChange,
-                // Left
+            // Left
                 bindingOrigin = this.bindingOrigin,
                 bindingOriginPropertyPath = this.bindingPropertyPath,
                 bindingOriginValue = bindingOrigin.getProperty(bindingOriginPropertyPath),