From db5db0a92c1fb67eac262c33d4fbf776ceabbb3c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 27 Feb 2012 21:17:29 -0800 Subject: breadcrumb cleanup and moving the resized on top of the timeline panel Signed-off-by: Valerio Virgillito --- .../bread-crumb-button.reel/bread-crumb-button.js | 26 ++++++++++++++-------- .../layout/bread-crumb.reel/bread-crumb.css | 5 ++--- .../layout/bread-crumb.reel/bread-crumb.html | 8 +++---- .../layout/bread-crumb.reel/bread-crumb.js | 15 +------------ js/ninja.reel/ninja.html | 14 ++++++++---- .../Timeline/TimelinePanel.reel/TimelinePanel.js | 2 -- 6 files changed, 34 insertions(+), 36 deletions(-) (limited to 'js') diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js index 3f5b87e1..c1ac99bd 100755 --- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js +++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js @@ -17,6 +17,11 @@ exports.BreadcrumbButton = Montage.create(Component, { value: null }, + // Bound container for the button + container: { + value: null + }, + prepareForDraw: { value: function() { this.element.addEventListener("mousedown", this, false); @@ -25,27 +30,30 @@ exports.BreadcrumbButton = Montage.create(Component, { draw: { value: function() { + + // Temporary until we have the new template + /* + if(this.container.id === "UserContent") { + this.button.innerHTML = "Body"; + } else { + this.button.innerHTML = this.container.nodeName.toLowerCase(); + } + */ + // + if(this.data.element.id === "UserContent") { this.button.innerHTML = "Body"; } else { this.button.innerHTML = this.data.element.nodeName; } + } }, handleMousedown: { value: function(event) { - - //this.data.selected=true; NJevent('breadCrumbTrail',this.data); - //this.data.selected=false; - } } - - - - - }); \ No newline at end of file diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css index cc984609..0ca8adec 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.css +++ b/js/components/layout/bread-crumb.reel/bread-crumb.css @@ -4,12 +4,11 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -.bread_crumb{ +.breadcrumbTrail{ background-color: #282828; border-style: double; height: 26px; -} -.breadcrumbtrail{ + -webkit-box-flex: 0; } .bread_crumb_button{ diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index c1b9ed61..234596a6 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html @@ -16,7 +16,7 @@ "module": "js/components/layout/bread-crumb.reel", "name": "Breadcrumb", "properties": { - "element": {"#": "breadcrumb_trail"}, + "element": {"#": "breadcrumbTrail"}, "button" : {"@":"breadCrumbButton"}, "stylerepetition" : {"@":"repetition1"} @@ -60,11 +60,11 @@ -