Permalink
Browse files

Added support for IOS5.

  • Loading branch information...
1 parent 35b36e2 commit 77d9e5577d6ad13bcb0512608359837f31e1e7b2 @ephox-rob ephox-rob committed Jun 10, 2011
Showing with 16 additions and 5 deletions.
  1. +2 −0 changelog.txt
  2. +4 −4 jscripts/tiny_mce/classes/Editor.js
  3. +10 −1 jscripts/tiny_mce/classes/tinymce.js
View
@@ -1,3 +1,5 @@
+Version 3.4.x (2011-??-??)
+ Added support for IOS5.
Version 3.4.3 (2011-06-09)
Fixed bug where deleting backwards before an image into a list would put the cursor in the wrong location.
Fixed bug where styles plugin would not apply styles across multiple selected block elements correctly.
@@ -889,10 +889,10 @@
if (!t.getElement())
return;
- // Is a iPad/iPhone, then skip initialization. We need to sniff here since the
- // browser says it has contentEditable support but there is no visible caret
- // We will remove this check ones Apple implements full contentEditable support
- if (tinymce.isIDevice)
+ // Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
+ // here since the browser says it has contentEditable support but there is no visible
+ // caret We will remove this check ones Apple implements full contentEditable support
+ if (tinymce.isIDevice && !tinymce.isIOS5)
return;
// Add hidden input for non input elements inside form elements
@@ -129,6 +129,15 @@
* @final
*/
t.isIDevice = /(iPad|iPhone)/.test(ua);
+
+ /**
+ * Constant that is true if the current browser is running on iOS 5 or greater.
+ *
+ * @property isIOS5
+ * @type Boolean
+ * @final
+ */
+ t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;
// TinyMCE .NET webcontrol might be setting the values for TinyMCE
if (win.tinyMCEPreInit) {
@@ -830,4 +839,4 @@
*
* @namespace tinymce.plugins
*/
-})(window);
+})(window);

0 comments on commit 77d9e55

Please sign in to comment.