From 01211be8e96360dcccdc421e5cb19c7708f5dfdd Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Wed, 28 Mar 2012 14:37:49 -0700
Subject: Bug #1073: Panels interact with hottest drag drop
Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
js/panels/drag-drop-composer.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'js/panels')
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, {
e.stopImmediatePropagation();
if (!this._dragover) {
this._dragover = true;
- this.component.element.classList.add("dragOver");
+ if (this.component.application.ninja.componentBeingDragged) {
+ this.component.element.classList.add("dragOver");
+ }
}
}
},
--
cgit v1.2.3
From bff711520b7d21cfffe07c7a14fe8870243ba796 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Thu, 29 Mar 2012 14:06:22 -0700
Subject: Resizing Bugs
Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
js/panels/Splitter.js | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
(limited to 'js/panels')
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, {
handleClick : {
value: function() {
if (!this.disabled) {
- this.panel.addEventListener("webkitTransitionEnd", this, false);
+ if(this.panel.element) {
+ this.panel.element.addEventListener("webkitTransitionEnd", this, false);
+ } else {
+ this.panel.addEventListener("webkitTransitionEnd", this, false);
+ }
this.collapsed = !this.collapsed;
this.needsDraw = true;
}
@@ -103,7 +107,12 @@ exports.Splitter = Montage.create(Component, {
handleWebkitTransitionEnd: {
value: function() {
- this.panel.removeEventListener("webkitTransitionEnd", this, false);
+ if(this.panel.element) {
+ this.panel.element.removeEventListener("webkitTransitionEnd", this, false);
+ } else {
+ this.panel.removeEventListener("webkitTransitionEnd", this, false);
+ }
+
this.application.ninja.stage.resizeCanvases = true;
}
},
--
cgit v1.2.3