diff options
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Splitter.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 | ||||
-rw-r--r-- | js/panels/resize-composer.js | 34 |
3 files changed, 30 insertions, 10 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index e92cb2dd..6791e0d5 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, { | |||
55 | }, | 55 | }, |
56 | set: function(value) { | 56 | set: function(value) { |
57 | this._collapsed = value; | 57 | this._collapsed = value; |
58 | 58 | this.needsDraw = true; | |
59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); | 59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); |
60 | } | 60 | } |
61 | }, | 61 | }, |
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 6e5e89f8..0d1774cd 100644 --- a/js/panels/resize-composer.js +++ b/js/panels/resize-composer.js | |||
@@ -9,6 +9,14 @@ var Composer = require("montage/ui/composer/composer").Composer; | |||
9 | 9 | ||
10 | exports.ResizeComposer = Montage.create(Composer, { | 10 | exports.ResizeComposer = Montage.create(Composer, { |
11 | 11 | ||
12 | xAxis: { | ||
13 | value: true | ||
14 | }, | ||
15 | |||
16 | yAxis: { | ||
17 | value: true | ||
18 | }, | ||
19 | |||
12 | enabled : { | 20 | enabled : { |
13 | enumerable: false, | 21 | enumerable: false, |
14 | value: true | 22 | value: true |
@@ -69,6 +77,7 @@ exports.ResizeComposer = Montage.create(Composer, { | |||
69 | load: { | 77 | load: { |
70 | value: function() { | 78 | value: function() { |
71 | this.element.addEventListener("mousedown", this, true); | 79 | this.element.addEventListener("mousedown", this, true); |
80 | this.element.addEventListener("dblclick", this, true); | ||
72 | } | 81 | } |
73 | }, | 82 | }, |
74 | 83 | ||
@@ -104,18 +113,29 @@ exports.ResizeComposer = Montage.create(Composer, { | |||
104 | 113 | ||
105 | captureMousemove: { | 114 | captureMousemove: { |
106 | value: function(e) { | 115 | value: function(e) { |
107 | this._deltaX = e.clientX - this._startX; | 116 | if (this.xAxis) { |
108 | this._deltaY = e.clientY - this._startY; | 117 | this._deltaX = e.clientX - this._startX; |
118 | } | ||
119 | else { | ||
120 | this._deltaX = 0; | ||
121 | } | ||
122 | if (this.yAxis) { | ||
123 | this._deltaY = e.clientY - this._startY; | ||
124 | } | ||
125 | else { | ||
126 | this._deltaY = 0; | ||
127 | } | ||
109 | this._executeEvent("resizeMove"); | 128 | this._executeEvent("resizeMove"); |
110 | } | 129 | } |
111 | }, | 130 | }, |
112 | 131 | ||
113 | deserializedFromTemplate: { | 132 | captureDblclick: { |
114 | value: function() { | 133 | value:function(e) { |
115 | if (this.component) { | 134 | this._reset(); |
116 | this.component.addComposer(this); | 135 | this._executeEvent("resizeReset"); |
117 | } | ||
118 | } | 136 | } |
119 | } | 137 | } |
120 | 138 | ||
139 | |||
140 | |||
121 | }); \ No newline at end of file | 141 | }); \ No newline at end of file |