Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

36 files changed, 283 insertions, 2657 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 2c91ca13..4448e1f1 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
     {
         "codeCompleteCheck":{
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "codeComplete"}
             },
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 68f3be2b..ee314628 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -21,7 +21,7 @@
                 },
 
                 "breadCrumbButton": {
-                    "prototype": "montage/ui/button.reel",
+                    "prototype": "montage/ui/native/button.reel",
                     "properties": {
                         "element": {"#": "breadcrumb_button"}
                     },
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index e68d17c5..ebaa4ccd 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -20,7 +20,7 @@
             },
 
             "closeButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "close-btn"},
                     "identifier": "closeButton"
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index b9c546ed..0f5503f6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -9,18 +9,15 @@ var Component = require("montage/ui/component").Component;
 
 exports.MenuEntry = Montage.create(Component, {
     topHeader: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     topHeaderText: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     subEntries: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     // Reference to the parent Menu component
@@ -36,8 +33,7 @@ exports.MenuEntry = Montage.create(Component, {
             if(value !== this._menu) {
                 this._menu = value;
             }
-        },
-        serializable: true
+        }
     },
 
     _data: {
@@ -52,8 +48,7 @@ exports.MenuEntry = Montage.create(Component, {
             if(this._data !== value) {
                 this._data = value;
             }
-        },
-        serializable: true
+        }
     },
 
     select: {
@@ -79,22 +74,20 @@ exports.MenuEntry = Montage.create(Component, {
             return this._menuIsActive;
         },
         set: function(value) {
-            if(value)  this.topHeader.addEventListener("mouseover", this, false);
+            if(value)  this.element.addEventListener("mouseover", this, false);
         }
     },
 
-    handleClick: {
+    captureMousedown: {
         value: function(event) {
             // TODO: Hack! Rework this!
             this.parentComponent.ownerComponent.toggleActivation(this);
-//            this._menu.toggleActivation(this);
         }
     },
 
     handleMouseover: {
         value: function(event) {
             this.parentComponent.ownerComponent.activeEntry = this;
-//            this._menu.activeEntry = this;
         }
     },
 
@@ -105,14 +98,7 @@ exports.MenuEntry = Montage.create(Component, {
 
             this.topHeaderText.innerHTML = this.data.header;
 
-            this.element.addEventListener("click", this, false);
-
-            Object.defineBinding(this, "menuIsActive", {
-                boundObject: this._menu,
-                boundObjectPropertyPath: "active",
-                oneway: true
-            });
-
+            this.element.addEventListener("mousedown", this, true);
         }
     }
 });
\ No newline at end of file
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index f9a625a3..3a5bf4ab 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -10,18 +10,15 @@ var Component = require("montage/ui/component").Component;
 exports.MenuItem = Montage.create(Component, {
 
     itemBackground: {
-        value: null,
-        serializable: true
+        value: null
     },