diff options
author | Armen Kesablyan | 2012-03-23 14:33:41 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-03-23 14:33:41 -0700 |
commit | 94a4be4b7b77f4c1498e8fb65e00d73ccbd56813 (patch) | |
tree | 77dd6444fcec5a4180b9245c9e7c260f599a57b9 /js | |
parent | cd0b4714b782f8cc4cf9255fa2653d3d5eeade43 (diff) | |
download | ninja-94a4be4b7b77f4c1498e8fb65e00d73ccbd56813.tar.gz |
Resizers updated
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.css | 10 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.html | 4 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 13 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 | ||||
-rw-r--r-- | js/panels/resize-composer.js | 13 |
5 files changed, 34 insertions, 10 deletions
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 @@ | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .breadcrumbTrail{ | 7 | .breadcrumbTrail { |
8 | |||
8 | background-color: #282828; | 9 | background-color: #282828; |
9 | border-style: double; | ||
10 | height: 26px; | 10 | height: 26px; |
11 | position:relative; | 11 | position:relative; |
12 | -webkit-box-flex: 0; | 12 | -webkit-box-flex: 0; |
13 | } | 13 | } |
14 | 14 | ||
15 | .mainContentContainer > section.breadcrumbTrail { | ||
16 | border:0; | ||
17 | margin:0; | ||
18 | border-bottom:1px solid #000; | ||
19 | margin-bottom:1px; | ||
20 | } | ||
15 | .breadcrumbTrail button.nj-skinned { | 21 | .breadcrumbTrail button.nj-skinned { |
16 | float: left; | 22 | float: left; |
17 | width: 60px; | 23 | 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 @@ | |||
148 | { | 148 | { |
149 | "type": "resizeEnd", | 149 | "type": "resizeEnd", |
150 | "listener": {"@": "owner"} | 150 | "listener": {"@": "owner"} |
151 | }, | ||
152 | { | ||
153 | "type": "resizeReset", | ||
154 | "listener": {"@": "owner"} | ||
151 | } | 155 | } |
152 | ] | 156 | ] |
153 | }, | 157 | }, |
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, { | |||
97 | } | 97 | } |
98 | }, | 98 | }, |
99 | 99 | ||
100 | handleResizeReset: { | ||
101 | value: function(e) { | ||
102 | this.width = 253; | ||
103 | this.height = 140; | ||
104 | this._resizedHeight = 0; | ||
105 | this._resizedWidth = 0; | ||
106 | this.needsDraw = true; | ||
107 | this.timelineSplitter.collapsed = false; | ||
108 | this.panelSplitter.collapsed = false; | ||
109 | } | ||
110 | }, | ||
111 | |||
112 | |||
100 | selectedElements: { | 113 | selectedElements: { |
101 | value: [] | 114 | value: [] |
102 | }, | 115 | }, |
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 @@ | |||
10 | height: 100%; | 10 | height: 100%; |
11 | } | 11 | } |
12 | .maintimeline{ | 12 | .maintimeline{ |
13 | border-style: double; | ||
14 | -webkit-box-flex: 1; | 13 | -webkit-box-flex: 1; |
15 | display: -webkit-box; | 14 | display: -webkit-box; |
16 | -webkit-box-orient: horizontal | 15 | -webkit-box-orient: horizontal; |
17 | height : 100%; | 16 | height : 100%; |
18 | position: relative; | 17 | position: relative; |
18 | margin-top:1px; | ||
19 | } | 19 | } |
20 | .leftinside{ | 20 | .leftinside{ |
21 | height: 100%; | 21 | 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, { | |||
77 | load: { | 77 | load: { |
78 | value: function() { | 78 | value: function() { |
79 | this.element.addEventListener("mousedown", this, true); | 79 | this.element.addEventListener("mousedown", this, true); |
80 | this.element.addEventListener("dblclick", this, true); | ||
80 | } | 81 | } |
81 | }, | 82 | }, |
82 | 83 | ||
@@ -112,7 +113,6 @@ exports.ResizeComposer = Montage.create(Composer, { | |||
112 | 113 | ||
113 | captureMousemove: { | 114 | captureMousemove: { |
114 | value: function(e) { | 115 | value: function(e) { |
115 | |||
116 | if (this.xAxis) { | 116 | if (this.xAxis) { |
117 | this._deltaX = e.clientX - this._startX; | 117 | this._deltaX = e.clientX - this._startX; |
118 | } | 118 | } |
@@ -129,12 +129,13 @@ exports.ResizeComposer = Montage.create(Composer, { | |||
129 | } | 129 | } |
130 | }, | 130 | }, |
131 | 131 | ||
132 | deserializedFromTemplate: { | 132 | captureDblclick: { |
133 | value: function() { | 133 | value:function(e) { |
134 | if (this.component) { | 134 | this._reset(); |
135 | this.component.addComposer(this); | 135 | this._executeEvent("resizeReset"); |
136 | } | ||
137 | } | 136 | } |
138 | } | 137 | } |
139 | 138 | ||
139 | |||
140 | |||
140 | }); \ No newline at end of file | 141 | }); \ No newline at end of file |