From defef645e27084bc208569ebe32b4748683ecc6b Mon Sep 17 00:00:00 2001 From: Lars Kneschke Date: Wed, 9 May 2007 15:37:25 +0000 Subject: [PATCH] disabled context menu in simple view to enable FF2 and IE7 spellchecker --- phpgwapi/inc/class.html.inc.php | 2 ++ phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js | 6 ++++-- phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js | 3 ++- phpgwapi/js/fckeditor/editor/fckeditor.html | 3 ++- phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js | 2 +- phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php index ca3696fd8d..414b9d7228 100644 --- a/phpgwapi/inc/class.html.inc.php +++ b/phpgwapi/inc/class.html.inc.php @@ -621,6 +621,7 @@ class html switch($_mode) { case 'simple': $oFCKeditor->ToolbarSet = 'egw_simple'; + $oFCKeditor->Config['ContextMenu'] = false; break; default: @@ -661,6 +662,7 @@ class html return ""; break; case 'simple': + $oFCKeditor->Config['ContextMenu'] = false; $oFCKeditor->ToolbarSet = 'egw_simple'; return $oFCKeditor->CreateHTML() ; break; diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js index 0a35d68e67..20030fd12c 100644 --- a/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js +++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js @@ -60,8 +60,10 @@ FCK.InitializeBehaviors = function() this.EditorDocument.addEventListener( 'dblclick', this._DblClickListener, true ) ; // Reset the context menu. - FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow( FCK.EditorWindow ) ; - FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument ) ; + if ( FCKConfig.ContextMenu != null ) { + FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow( FCK.EditorWindow ) ; + FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument ) ; + } } FCK.MakeEditable = function() diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js index a6df4b4f44..4aabce8799 100644 --- a/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js +++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js @@ -127,7 +127,8 @@ FCK.InitializeBehaviors = function( dontReturn ) this.EditorDocument.body.attachEvent( 'onpaste', Doc_OnPaste ) ; // Reset the context menu. - FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument.body ) ; + if ( FCKConfig.ContextMenu != null ) + FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument.body ) ; // Build the "TAB" key replacement (if necessary). if ( FCKConfig.TabSpaces > 0 ) diff --git a/phpgwapi/js/fckeditor/editor/fckeditor.html b/phpgwapi/js/fckeditor/editor/fckeditor.html index 92beaf4d20..5abcf31a57 100644 --- a/phpgwapi/js/fckeditor/editor/fckeditor.html +++ b/phpgwapi/js/fckeditor/editor/fckeditor.html @@ -101,7 +101,8 @@ LoadScript( 'lang/' + FCKLanguageManager.ActiveLanguage.Code + '.js' ) ;