Fixed bug #13062: htmlArea RTE: "non-floating" float value doesn't stick on images
authorStanislas Rolland <typo3@sjbr.ca>
Tue, 8 Jun 2010 23:04:30 +0000 (23:04 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Tue, 8 Jun 2010 23:04:30 +0000 (23:04 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7839 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php

index fc63266..5386785 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Updated htmlArea RTE manual.
        * Fixed bug #14662: htmlArea RTE: Should use t3lib_utility_Client::getBrowserInfo
+       * Fixed bug #13062: htmlArea RTE: "non-floating" float value doesn't stick on images
 
 2010-06-08  Oliver Hader  <oliver@typo3.org>
 
index f62e135..fb70861 100644 (file)
@@ -2,6 +2,7 @@
 
        * Updated htmlArea RTE manual.
        * Fixed bug #14662: htmlArea RTE: Should use t3lib_utility_Client::getBrowserInfo
+       * Fixed bug #13062: htmlArea RTE: "non-floating" float value doesn't stick on images
 
 2010-06-06  Stanislas Rolland  <typo3@sjbr.ca>
 
index 50c2e98..2c51585 100644 (file)
@@ -500,18 +500,14 @@ class tx_rtehtmlarea_dam_browse_media extends tx_dam_browse_media {
                                                }
                                                selectedImageRef.removeAttribute("border");
                                        }
-
                                        if (document.imageData.iFloat) {
                                                var iFloat = document.imageData.iFloat.options[document.imageData.iFloat.selectedIndex].value;
-                                               if (iFloat || selectedImageRef.style.cssFloat || selectedImageRef.style.styleFloat) {
-                                                       if (document.all) {
-                                                               selectedImageRef.style.styleFloat = (iFloat != "none") ? iFloat : "";
-                                                       } else {
-                                                               selectedImageRef.style.cssFloat = (iFloat != "none") ? iFloat : "";
-                                                       }
+                                               if (document.all) {
+                                                       selectedImageRef.style.styleFloat = iFloat ? iFloat : "";
+                                               } else {
+                                                       selectedImageRef.style.cssFloat = iFloat ? iFloat : "";
                                                }
                                        }
-
                                        if (classesImage && document.imageData.iClass) {
                                                var iClass = document.imageData.iClass.options[document.imageData.iClass.selectedIndex].value;
                                                if (iClass || (selectedImageRef.attributes["class"] && selectedImageRef.attributes["class"].value)) {
index 7ec4193..ec9022f 100644 (file)
@@ -602,12 +602,10 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                        }
                                        if (document.imageData.iFloat) {
                                                var iFloat = document.imageData.iFloat.options[document.imageData.iFloat.selectedIndex].value;
-                                               if (iFloat || selectedImageRef.style.cssFloat || selectedImageRef.style.styleFloat) {
-                                                       if (document.all) {
-                                                               selectedImageRef.style.styleFloat = (iFloat != "none") ? iFloat : "";
-                                                       } else {
-                                                               selectedImageRef.style.cssFloat = (iFloat != "none") ? iFloat : "";
-                                                       }
+                                               if (document.all) {
+                                                       selectedImageRef.style.styleFloat = iFloat ? iFloat : "";
+                                               } else {
+                                                       selectedImageRef.style.cssFloat = iFloat ? iFloat : "";
                                                }
                                        }
                                        if (classesImage && document.imageData.iClass) {