From 4eac871c019e16db3f989e3d260f5bfe379e9cd0 Mon Sep 17 00:00:00 2001
From: "bugzilla%arlen.demon.co.uk"
 <bugzilla%arlen.demon.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 20 Dec 2004 17:48:33 +0000
Subject: [PATCH] Bug 274885 JS errors Ctrl/Shift+Left Clicking and Right
 Clicking links in P3P summary - Left click and more XUL tidyup patch v0.2b
 p=me r=db48x sr=neil.parkwaycc.co.uk

git-svn-id: svn://10.0.0.236/trunk@166890 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/p3p/resources/content/p3pSummary.js  | 6 ++----
 mozilla/extensions/p3p/resources/content/p3pSummary.xul | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mozilla/extensions/p3p/resources/content/p3pSummary.js b/mozilla/extensions/p3p/resources/content/p3pSummary.js
index 850e081c0c7..ba0e23a6ce7 100644
--- a/mozilla/extensions/p3p/resources/content/p3pSummary.js
+++ b/mozilla/extensions/p3p/resources/content/p3pSummary.js
@@ -189,10 +189,8 @@ function p3pSummarySavePage()
  */
 function captureContentClick(aEvent)
 {
-  if (aEvent.target.hasAttribute("message")) {
+  if (aEvent.target.hasAttribute("message"))
     alertMessage(aEvent.target.getAttribute("message"));
-    return true;
-  }
 
-  return contentAreaClick(aEvent);
+  return true;
 }
diff --git a/mozilla/extensions/p3p/resources/content/p3pSummary.xul b/mozilla/extensions/p3p/resources/content/p3pSummary.xul
index a9e9de88667..9d4d92ba4de 100644
--- a/mozilla/extensions/p3p/resources/content/p3pSummary.xul
+++ b/mozilla/extensions/p3p/resources/content/p3pSummary.xul
@@ -58,13 +58,9 @@
 
   <script type="application/x-javascript" src="chrome://p3p/content/p3pSummary.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/p3p/nsPolicyViewer.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
   <script type="application/x-javascript" src="chrome://navigator/content/browser.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
 
   <commandset id="commands">
     <commandset id="globalEditMenuItems"/>
@@ -149,7 +145,7 @@
     </menubar>  
   </toolbox>
   
-  <vbox id="appcontent" flex="1" ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
+  <vbox id="appcontent" flex="1">
     <browser type="content-primary" id="content" flex="1"
              onclick="captureContentClick(event);"/>
   </vbox>