Fixed bug #9935: htmlArea RTE: enableWordClean on paste does not work when hidden...

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

diff --git a/ChangeLog b/ChangeLog
index 89e5890..5b0d709 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
        * Added feature #10196: htmlArea RTE: Remove extension configuration variable enableClickEnlarge
        * Fixed bug #10197: htmlArea RTE: Missing XCLASS inclusion in class.tx_rtehtmlarea_pi1.php
        * Follow-up to #10181: htmlArea RTE: Move status bar to plugin
        * Added feature #10196: htmlArea RTE: Remove extension configuration variable enableClickEnlarge
        * Fixed bug #10197: htmlArea RTE: Missing XCLASS inclusion in class.tx_rtehtmlarea_pi1.php
        * Follow-up to #10181: htmlArea RTE: Move status bar to plugin

+       * Fixed bug #9935: htmlArea RTE: enableWordClean on paste does not work when hidden button is not in toolbar

 
 2009-01-18  Francois Suter  <francois@typo3.org>
 
 
 2009-01-18  Francois Suter  <francois@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 02f3e51..b19b39c 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -5,6 +5,7 @@
        * Added feature #10196: htmlArea RTE: Remove extension configuration variable enableClickEnlarge
        * Fixed bug #10197: htmlArea RTE: Missing XCLASS inclusion in class.tx_rtehtmlarea_pi1.php
        * Follow-up to #10181: htmlArea RTE: Move status bar to plugin
        * Added feature #10196: htmlArea RTE: Remove extension configuration variable enableClickEnlarge
        * Fixed bug #10197: htmlArea RTE: Missing XCLASS inclusion in class.tx_rtehtmlarea_pi1.php
        * Follow-up to #10181: htmlArea RTE: Move status bar to plugin

+       * Fixed bug #9935: htmlArea RTE: enableWordClean on paste does not work when hidden button is not in toolbar

 
 2009-01-14  Stanislas Rolland  <typo3@sjbr.ca>
 
 
 2009-01-14  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php b/typo3/sysext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php
index 8b2ee97..3e327de 100644 (file)
--- a/typo3/sysext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php
+++ b/typo3/sysext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
 /***************************************************************
 *  Copyright notice
 *

-*  (c) 2008 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+*  (c) 2008-2009 Stanislas Rolland <typo3(arobas)sjbr.ca>

 *  All rights reserved
 *
 *  This script is part of the Typo3 project. The Typo3 project is
 *  All rights reserved
 *
 *  This script is part of the Typo3 project. The Typo3 project is


@@ -24,7 +24,7 @@
 /**
  * Default Clean extension for htmlArea RTE
  *
 /**
  * Default Clean extension for htmlArea RTE
  *

- * @author Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>

  *
  * TYPO3 SVN ID: $Id$
  *
  *
  * TYPO3 SVN ID: $Id$
  *


@@ -49,7 +49,7 @@ class tx_rtehtmlarea_defaultclean extends tx_rtehtmlareaapi {
                );
        
        public function main($parentObject) {
                );
        
        public function main($parentObject) {

-               return parent::main($parentObject) && $this->thisConfig['enableWordClean'];
+               return parent::main($parentObject) && $this->thisConfig['enableWordClean'] && !is_array($this->thisConfig['enableWordClean.']['HTMLparser.']);

        }
        
        /**
        }
        
        /**


@@ -78,6 +78,17 @@ class tx_rtehtmlarea_defaultclean extends tx_rtehtmlareaapi {
                return $registerRTEinJavascriptString;
        }
 
                return $registerRTEinJavascriptString;
        }
 

+       /**
+        * Return an updated array of toolbar enabled buttons
+        * Force inclusion of hidden button cleanword
+        *
+        * @param       array           $show: array of toolbar elements that will be enabled, unless modified here
+        *
+        * @return      array           toolbar button array, possibly updated
+        */
+       public function applyToolbarConstraints($show) {
+               return array_unique(array_merge($show, t3lib_div::trimExplode(',', $this->pluginButtons)));
+       }

 } // end of class
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php']) {
 } // end of class
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php']) {

diff --git a/typo3/sysext/rtehtmlarea/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php b/typo3/sysext/rtehtmlarea/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php
index 3dd9664..aab7dd2 100644 (file)
--- a/typo3/sysext/rtehtmlarea/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php
+++ b/typo3/sysext/rtehtmlarea/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
 /***************************************************************
 *  Copyright notice
 *

-*  (c) 2008 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+*  (c) 2008-2009 Stanislas Rolland <typo3(arobas)sjbr.ca>

 *  All rights reserved
 *
 *  This script is part of the Typo3 project. The Typo3 project is
 *  All rights reserved
 *
 *  This script is part of the Typo3 project. The Typo3 project is


@@ -24,7 +24,7 @@
 /**
  * TYPO3 HTML Parser extension for htmlArea RTE
  *
 /**
  * TYPO3 HTML Parser extension for htmlArea RTE
  *

- * @author Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>

  *
  * TYPO3 SVN ID: $Id$
  *
  *
  * TYPO3 SVN ID: $Id$
  *


@@ -78,6 +78,18 @@ class tx_rtehtmlarea_typo3htmlparser extends tx_rtehtmlareaapi {
                }
                return $registerRTEinJavascriptString;
        }
                }
                return $registerRTEinJavascriptString;
        }

+       
+       /**
+        * Return an updated array of toolbar enabled buttons
+        * Force inclusion of hidden button cleanword
+        *
+        * @param       array           $show: array of toolbar elements that will be enabled, unless modified here
+        *
+        * @return      array           toolbar button array, possibly updated
+        */
+       public function applyToolbarConstraints($show) {
+               return array_unique(array_merge($show, t3lib_div::trimExplode(',', $this->pluginButtons)));
+       }

 
 } // end of class
 
 
 } // end of class
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultClean/default-clean.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultClean/default-clean.js
index 40ead9a..190135b 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultClean/default-clean.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultClean/default-clean.js
@@ -175,12 +175,12 @@ DefaultClean.wordCleanHandler = function (ev) {
                while (owner.parentElement) { owner = owner.parentElement; }
        }
        var editor = RTEarea[owner._editorNo].editor;
                while (owner.parentElement) { owner = owner.parentElement; }
        }
        var editor = RTEarea[owner._editorNo].editor;

-       
+

                // If we dropped an image dragged from the TYPO3 Image plugin, let's close the dialog window
        if (typeof(HTMLArea.Dialog) != "undefined" && HTMLArea.Dialog.TYPO3Image) {
                HTMLArea.Dialog.TYPO3Image.close();
        } else {
                // If we dropped an image dragged from the TYPO3 Image plugin, let's close the dialog window
        if (typeof(HTMLArea.Dialog) != "undefined" && HTMLArea.Dialog.TYPO3Image) {
                HTMLArea.Dialog.TYPO3Image.close();
        } else {

-               window.setTimeout("DefaultClean.cleanLater(" + editor._editorNumber + ");", 250);
+               window.setTimeout("DefaultClean.cleanLater(\'" + editor._editorNumber + "\');", 250);

        }
 };
 
        }
 };