From c456b708de007d96d96f280c1e21c4dffb477e16 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 18 Aug 2005 16:10:37 +0000
Subject: [PATCH] more bug fixes

---
 docs/changelog/6.x.x.txt                  | 3 +++
 lib/WebGUI/Asset.pm                       | 2 --
 lib/WebGUI/Asset/Wobject/Collaboration.pm | 2 +-
 www/extras/contextMenu/contextMenu.js     | 4 ++--
 www/extras/tinymce/jscripts/webgui.js     | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index a56894337..0911f1fa1 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -18,6 +18,9 @@
  - fix [ 1256549 ] Users are allowed to set url to extras or uploads
  - fix [ 1262505 ] Unable to edit group info
  - Added the missing export toolbar icon.
+ - Fixed the context menus that were unclickable.
+ - Fixed a problem with the rich editor in Internet Explorer that caused it
+   not to save new content.
  - fix [ 1261789 ] fixed(?) can't edit collaboration (Collaboration.pm) (andreasg)
 
 
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 950317363..af900180e 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1445,8 +1445,6 @@ sub www_manageAssets {
 		$output .= 'var contextMenu = new contextMenu_createWithLink("'.$child->getId.'","More");
                 contextMenu.addLink("'.$child->getUrl("func=editBranch").'","'.$i18n->get("edit branch").'");
                 contextMenu.addLink("'.$child->getUrl("func=createShortcut&proceed=manageAssets").'","'.$i18n->get("create shortcut").'");
-                contextMenu.addLink("'.$child->getUrl("func=promote").'","'.$i18n->get("promote").'");
-                contextMenu.addLink("'.$child->getUrl("func=demote").'","'.$i18n->get("demote").'");
 		contextMenu.addLink("'.$child->getUrl("func=manageRevisions").'","'.$i18n->get("revisions").'");
                 contextMenu.addLink("'.$child->getUrl.'","'.$i18n->get("view").'"); '."\n";
 		my $title = $child->getTitle;
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index f2d81be71..9d28f2704 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -979,7 +979,7 @@ sub www_search {
 	$self->appendTemplateLabels(\%var);
         $var{doit} = $session{form}{doit};
         if ($session{form}{doit}) {
-                my @fieldsToSearch = qw(asset.title asset.synopsis Post.content Post.username Post.userDefined1 Post.userDefined2 Post.userDefined3 Post.userDefined4 Post.userDefined5);
+                my @fieldsToSearch = qw(assetData.title assetData.synopsis Post.content Post.username Post.userDefined1 Post.userDefined2 Post.userDefined3 Post.userDefined4 Post.userDefined5);
 		my $all;
 		if ($session{scratch}{$self->getId."_all"} ne "") {
 			$session{scratch}{$self->getId."_all"} =~ s/,/ /g;
diff --git a/www/extras/contextMenu/contextMenu.js b/www/extras/contextMenu/contextMenu.js
index 6b7c5893f..2ff8393d9 100755
--- a/www/extras/contextMenu/contextMenu.js
+++ b/www/extras/contextMenu/contextMenu.js
@@ -1,8 +1,8 @@
 var ie5=document.all&&document.getElementById
 var contextMenu_items = new Array();
 
-var contextMenu_old = (document.onmousedown) ? document.onmousdown : function () {};
-document.onmousedown= function () {contextMenu_old();contextMenu_hide();};
+var contextMenu_old = (document.onclick) ? document.onclick : function () {};
+document.onclick= function () {contextMenu_old();contextMenu_hide();};
 
 function contextMenu_renderLeftClick(menuId,e) {
 	contextMenu_hide(e);
diff --git a/www/extras/tinymce/jscripts/webgui.js b/www/extras/tinymce/jscripts/webgui.js
index 96b909044..95661263c 100644
--- a/www/extras/tinymce/jscripts/webgui.js
+++ b/www/extras/tinymce/jscripts/webgui.js
@@ -14,7 +14,8 @@ function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
 
 function tinyMCE_WebGUI_Cleanup(type,value) {
 //	alert(value);
-	if (value != "[object HTMLBodyElement]") {
+//	return value;
+	if (value != "[object HTMLBodyElement]" && value != "[object]") {
 		value = value.replace(new RegExp("&quot;", "g"),"\"");
 	}
 	return value;