From 94a4be4b7b77f4c1498e8fb65e00d73ccbd56813 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Fri, 23 Mar 2012 14:33:41 -0700
Subject: Resizers updated

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.css       | 10 ++++++++--
 js/ninja.reel/ninja.html                                    |  4 ++++
 js/ninja.reel/ninja.js                                      | 13 +++++++++++++
 js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css |  4 ++--
 js/panels/resize-composer.js                                | 13 +++++++------
 5 files changed, 34 insertions(+), 10 deletions(-)

(limited to 'js')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index dcfd471c..26a56b45 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -4,14 +4,20 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-.breadcrumbTrail{
+.breadcrumbTrail {
+
     background-color: #282828;
-    border-style: double;
     height: 26px;
     position:relative;
     -webkit-box-flex: 0;
 }
 
+.mainContentContainer > section.breadcrumbTrail {
+    border:0;
+    margin:0;
+    border-bottom:1px solid #000;
+    margin-bottom:1px;
+}
 .breadcrumbTrail button.nj-skinned {
     float: left;
     width: 60px;
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index b3545329..7b5a6e52 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -148,6 +148,10 @@
                     {
                         "type": "resizeEnd",
                         "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeReset",
+                        "listener": {"@": "owner"}
                     }
                 ]
             },
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index e29c5057..b432755f 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -97,6 +97,19 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
+    handleResizeReset: {
+        value: function(e) {
+            this.width = 253;
+            this.height = 140;
+            this._resizedHeight = 0;
+            this._resizedWidth = 0;
+            this.needsDraw = true;
+            this.timelineSplitter.collapsed = false;
+            this.panelSplitter.collapsed = false;
+        }
+    },
+
+
     selectedElements: {
         value: []
     },
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 129b9771..067285ae 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -10,12 +10,12 @@
     height: 100%;
 }
 .maintimeline{
-    border-style: double;
     -webkit-box-flex: 1;
     display: -webkit-box;
-    -webkit-box-orient: horizontal
+    -webkit-box-orient: horizontal;
     height : 100%;
     position: relative;
+    margin-top:1px;
 }
 .leftinside{
     height: 100%;
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 450dc7b6..0d1774cd 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -77,6 +77,7 @@ exports.ResizeComposer = Montage.create(Composer, {
     load: {
         value: function() {
             this.element.addEventListener("mousedown", this, true);
+            this.element.addEventListener("dblclick", this, true);
         }
     },
 
@@ -112,7 +113,6 @@ exports.ResizeComposer = Montage.create(Composer, {
 
     captureMousemove: {
         value: function(e) {
-
             if (this.xAxis) {
                 this._deltaX = e.clientX - this._startX;
             }
@@ -129,12 +129,13 @@ exports.ResizeComposer = Montage.create(Composer, {
         }
     },
 
-    deserializedFromTemplate: {
-        value: function() {
-            if (this.component) {
-                this.component.addComposer(this);
-            }
+    captureDblclick: {
+        value:function(e) {
+            this._reset();
+            this._executeEvent("resizeReset");
         }
     }
 
+
+
 });
\ No newline at end of file
-- 
cgit v1.2.3