Fixed bug #15516: htmlArea RTE: Safari does not support WISIWYG editing on iPad
authorStanislas Rolland <typo3@sjbr.ca>
Sat, 28 Aug 2010 04:03:24 +0000 (04:03 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sat, 28 Aug 2010 04:03:24 +0000 (04:03 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-4@8713 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php

index 4db7a78..410459f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        * Fixed bug #15415: htmlArea RTE: RTEs hidden on load not usable with multiple RTEs in a record
        * Fixed bug #15328: htmlArea RTE: Strange behaviours inserting links in IE
        * Fixed bug #15584: htmlArea RTE: iframe baseURL may be incorrectly set
+       * Fixed bug #15516: htmlArea RTE: Safari does not support WISIWYG editing on iPad
 
 2010-08-27  Ernesto Baschny  <ernst@cron-it.de>
 
index f46788e..555f2af 100644 (file)
@@ -3,6 +3,7 @@
        * Fixed bug #15415: htmlArea RTE: RTEs hidden on load not usable with multiple RTEs in a record
        * Fixed bug #15328: htmlArea RTE: Strange behaviours inserting links in IE
        * Fixed bug #15584: htmlArea RTE: iframe baseURL may be incorrectly set
+       * Fixed bug #15516: htmlArea RTE: Safari does not support WISIWYG editing on iPad
 
 2010-08-26  Stanislas Rolland  <typo3@sjbr.ca>
 
index 910acca..ced5fc4 100644 (file)
@@ -59,7 +59,24 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        ),
                        'webkit' => array (
                                1 => array (
-                                       'version' => 523
+                                       'version' => 523,
+                                       'system' => 'mac'
+                               ),
+                               2 => array (
+                                       'version' => 523,
+                                       'system' => 'winNT'
+                               ),
+                               3 => array (
+                                       'version' => 523,
+                                       'system' => 'linux'
+                               ),
+                               4 => array (
+                                       'version' => 523,
+                                       'system' => 'win98'
+                               ),
+                               5 => array (
+                                       'version' => 523,
+                                       'system' => 'win95'
                                )
                        ),
                        'opera' => array (
@@ -1387,6 +1404,15 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                                }
                        }
                }
+               if ($browserInfo['system'] == 'mac') {
+                       if (strstr($userAgent,'iPad')) {
+                               $browserInfo['system'] = 'iPad';
+                       } elseif (strstr($userAgent,'iPhone')) {
+                               $browserInfo['system'] = 'iPhone';
+                       } elseif (strstr($userAgent,'iPod')) {
+                               $browserInfo['system'] = 'iPod';
+                       }
+               }
                return $browserInfo;
        }
        /***************************