From e92e70b8169222ca203b8f00459c0743ab35da0b Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Sat, 29 Jul 2006 05:36:55 +0000 Subject: [PATCH] fix for bug 53904 sr=ben, r=timeless --- suite/common/contentAreaDD.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/suite/common/contentAreaDD.js b/suite/common/contentAreaDD.js index b45c81c451d..8b499595b17 100644 --- a/suite/common/contentAreaDD.js +++ b/suite/common/contentAreaDD.js @@ -45,7 +45,7 @@ var contentAreaDNDObserver = { // htmlstring will be filled automatically if you fill urlstring var htmlstring = null; - var domselection = window._content.getSelection(); + var domselection = aEvent.view.getSelection(); if (domselection && !domselection.isCollapsed && domselection.containsNode(draggedNode,false)) { @@ -154,11 +154,13 @@ var contentAreaDNDObserver = { if (aEvent.getPreventDefault()) return; - // if the drag originated w/in this content area, bail early. This avoids loading - // a URL dragged from the content area into the very same content area (which is - // almost never the desired action). This code is a bit too simplistic and may - // have problems with nested frames, but that's not my problem ;) - if (aDragSession.sourceDocument == window._content.document) { + // if the drag originated w/in this content area, bail + // early. This avoids loading a URL dragged from the content + // area into the very same content area (which is almost never + // the desired action). This code is a bit too simplistic and + // may have problems with nested frames, but that's not my + // problem ;) + if (aDragSession.sourceDocument == aEvent.view.document) { aDragSession.canDrop = false; return; }