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/panels | |
parent | cd0b4714b782f8cc4cf9255fa2653d3d5eeade43 (diff) | |
download | ninja-94a4be4b7b77f4c1498e8fb65e00d73ccbd56813.tar.gz |
Resizers updated
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 | ||||
-rw-r--r-- | js/panels/resize-composer.js | 13 |
2 files changed, 9 insertions, 8 deletions
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 |