* Fixed bug #7878: Extension cannot override a previously defined htmlArea RTE hotkey

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3443 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 4a3e41f..8cb5b56 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-03-16  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #7877: htmlArea RTE block style feature raises javascript errors in IE6
 2008-03-16  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #7877: htmlArea RTE block style feature raises javascript errors in IE6

+       * Fixed bug #7878: Extension cannot override a previously defined htmlArea RTE hotkey

 
 2008-03-16  Martin Kutschker  <masi@typo3.org>
 
 
 2008-03-16  Martin Kutschker  <masi@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 5df46f2..a1e2ea6 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2008-03-16  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #7877: htmlArea RTE block style feature raises javascript errors in IE6
 2008-03-16  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #7877: htmlArea RTE block style feature raises javascript errors in IE6

+       * Fixed bug #7878: Extension cannot override a previously defined htmlArea RTE hotkey

 
 2008-03-15  Stanislas Rolland  <typo3@sjbr.ca>
 
 
 2008-03-15  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/doc/manual.sxw b/typo3/sysext/rtehtmlarea/doc/manual.sxw
index 73f409d..1e77b44 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
index 0b27922..b8992d3 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
@@ -401,8 +401,7 @@ HTMLArea.Config.prototype.registerDropdown = function(dropDownConfiguration) {
  */
 HTMLArea.Config.prototype.registerHotKey = function(hotKeyConfiguration) {
        if (typeof(this.hotKeyList[hotKeyConfiguration.id]) != "undefined") {
  */
 HTMLArea.Config.prototype.registerHotKey = function(hotKeyConfiguration) {
        if (typeof(this.hotKeyList[hotKeyConfiguration.id]) != "undefined") {

-               HTMLArea._appendToLog("ERROR [HTMLArea.Config::registerHotKey]: A hotkey with the same key " + hotKeyConfiguration.id + " already exists.");
-               return false;
+               HTMLArea._appendToLog("[HTMLArea.Config::registerHotKey]: A hotkey with the same key " + hotKeyConfiguration.id + " already exists and will be overidden.");

        }
        this.hotKeyList[hotKeyConfiguration.id] = hotKeyConfiguration;
        return true;
        }
        this.hotKeyList[hotKeyConfiguration.id] = hotKeyConfiguration;
        return true;