diff options
author | Eric Guzman | 2012-04-04 12:22:48 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-04 12:22:48 -0700 |
commit | b9d1eb3e330e486a31ba5d7de6902d8f5b023860 (patch) | |
tree | 48d1e0da4dcabe4e96442c8fc810fcbd045344a7 /js/panels | |
parent | bacc278a3729f4e6fd6ebb9971d6d47a90e58b36 (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-b9d1eb3e330e486a31ba5d7de6902d8f5b023860.tar.gz |
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Splitter.js | 13 | ||||
-rw-r--r-- | js/panels/drag-drop-composer.js | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index 6791e0d5..ac45b4ba 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -94,7 +94,11 @@ exports.Splitter = Montage.create(Component, { | |||
94 | handleClick : { | 94 | handleClick : { |
95 | value: function() { | 95 | value: function() { |
96 | if (!this.disabled) { | 96 | if (!this.disabled) { |
97 | this.panel.addEventListener("webkitTransitionEnd", this, false); | 97 | if(this.panel.element) { |
98 | this.panel.element.addEventListener("webkitTransitionEnd", this, false); | ||
99 | } else { | ||
100 | this.panel.addEventListener("webkitTransitionEnd", this, false); | ||
101 | } | ||
98 | this.collapsed = !this.collapsed; | 102 | this.collapsed = !this.collapsed; |
99 | this.needsDraw = true; | 103 | this.needsDraw = true; |
100 | } | 104 | } |
@@ -103,7 +107,12 @@ exports.Splitter = Montage.create(Component, { | |||
103 | 107 | ||
104 | handleWebkitTransitionEnd: { | 108 | handleWebkitTransitionEnd: { |
105 | value: function() { | 109 | value: function() { |
106 | this.panel.removeEventListener("webkitTransitionEnd", this, false); | 110 | if(this.panel.element) { |
111 | this.panel.element.removeEventListener("webkitTransitionEnd", this, false); | ||
112 | } else { | ||
113 | this.panel.removeEventListener("webkitTransitionEnd", this, false); | ||
114 | } | ||
115 | |||
107 | this.application.ninja.stage.resizeCanvases = true; | 116 | this.application.ninja.stage.resizeCanvases = true; |
108 | } | 117 | } |
109 | }, | 118 | }, |
diff --git a/js/panels/drag-drop-composer.js b/js/panels/drag-drop-composer.js index b36c8334..4791bd6d 100644 --- a/js/panels/drag-drop-composer.js +++ b/js/panels/drag-drop-composer.js | |||
@@ -91,7 +91,9 @@ exports.DragDropComposer = Montage.create(Composer, { | |||
91 | e.stopImmediatePropagation(); | 91 | e.stopImmediatePropagation(); |
92 | if (!this._dragover) { | 92 | if (!this._dragover) { |
93 | this._dragover = true; | 93 | this._dragover = true; |
94 | this.component.element.classList.add("dragOver"); | 94 | if (this.component.application.ninja.componentBeingDragged) { |
95 | this.component.element.classList.add("dragOver"); | ||
96 | } | ||
95 | } | 97 | } |
96 | } | 98 | } |
97 | }, | 99 | }, |