From a39c4c87a2eacb5e582251700aba7b74bc9b4c25 Mon Sep 17 00:00:00 2001 From: Stanislas Rolland Date: Sat, 28 Aug 2010 03:59:15 +0000 Subject: [PATCH] Fixed bug #15516: htmlArea RTE: Safari does not support WISIWYG editing on iPad git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8712 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 1 + typo3/sysext/rtehtmlarea/ChangeLog | 1 + .../rtehtmlarea/class.tx_rtehtmlarea_base.php | 28 ++++++++++++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 289ef25e303..756ed10a50b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,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 Ingo Renner diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog index bb32cbc5688..4aaac2b5d38 100644 --- a/typo3/sysext/rtehtmlarea/ChangeLog +++ b/typo3/sysext/rtehtmlarea/ChangeLog @@ -5,6 +5,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 diff --git a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php index 910acca280f..ced5fc44a50 100644 --- a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php +++ b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php @@ -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; } /*************************** -- 2.20.1