From e3f96cf06a4ec53544b2411ead0625e2bf92e5e1 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 27 Nov 2013 21:13:57 +0100
Subject: [PATCH] Fixed CKEditor issues

---
 com.woltlab.wcf/templates/wysiwyg.tpl    |  3 +-
 wcfsetup/install/files/js/WCF.Message.js | 45 +++++++++++++-----------
 wcfsetup/install/files/js/WCF.js         |  3 ++
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 35791f1c8e..fa00acac7d 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -8,8 +8,7 @@
 <script data-relocate="true">
 //<![CDATA[
 $(function() {
-	// exclude Android (not properly supported by CKEditor yet)
-	if (navigator.userAgent.match(/[aA]ndroid/)) {
+	if (!$.browser.ckeditor) {
 		return;
 	}
 
diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index 0e15139946..c44e4b1aa2 100644
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -1136,7 +1136,7 @@ WCF.Message.InlineEditor = Class.extend({
 	 */
 	_click: function(event, containerID) {
 		var $containerID = (event === null) ? containerID : $(event.currentTarget).data('containerID');
-		
+		console.debug("_click()");
 		if (this._activeElementID === '') {
 			this._activeElementID = $containerID;
 			this._prepare();
@@ -1333,16 +1333,21 @@ WCF.Message.InlineEditor = Class.extend({
 		// hide message options
 		this._container[this._activeElementID].find('.messageOptions').addClass('forceHidden');
 		
-		new WCF.PeriodicalExecuter($.proxy(function(pe) {
-			pe.stop();
-			
-			var $ckEditor = $('#' + this._messageEditorIDPrefix + this._container[this._activeElementID].data('objectID'));
-			$ckEditor.ckeditor(function() { this.ui.editor.focus(); });
-			
-			if (this._quoteManager) {
-				this._quoteManager.setAlternativeCKEditor($ckEditor);
-			}
-		}, this), 250);
+		if ($.browser.ckeditor) {
+			new WCF.PeriodicalExecuter($.proxy(function(pe) {
+				pe.stop();
+				
+				var $ckEditor = $('#' + this._messageEditorIDPrefix + this._container[this._activeElementID].data('objectID'));
+				$ckEditor.ckeditor(function() { this.ui.editor.focus(); });
+				
+				if (this._quoteManager) {
+					this._quoteManager.setAlternativeCKEditor($ckEditor);
+				}
+			}, this), 250);
+		}
+		else {
+			$('#' + this._messageEditorIDPrefix + this._container[this._activeElementID].data('objectID')).focus();
+		}
 	},
 	
 	/**
@@ -1369,13 +1374,13 @@ WCF.Message.InlineEditor = Class.extend({
 		var $objectID = $container.data('objectID');
 		var $message = '';
 		
-		if ($.browser.mobile) {
-			$message = $('#' + this._messageEditorIDPrefix + $objectID).val();
-		}
-		else {
+		if ($.browser.ckeditor) {
 			var $ckEditor = $('#' + this._messageEditorIDPrefix + $objectID).ckeditorGet();
 			$message = $ckEditor.getData();
 		}
+		else {
+			$message = $('#' + this._messageEditorIDPrefix + $objectID).val();
+		}
 		
 		this._proxy.setOption('data', {
 			actionName: 'save',
@@ -1402,13 +1407,13 @@ WCF.Message.InlineEditor = Class.extend({
 		var $objectID = $container.data('objectID');
 		var $message = '';
 		
-		if ($.browser.mobile) {
-			$message = $('#' + this._messageEditorIDPrefix + $objectID).val();
-		}
-		else {
+		if ($.browser.ckeditor) {
 			var $ckEditor = $('#' + this._messageEditorIDPrefix + $objectID).ckeditorGet();
 			$message = $ckEditor.getData();
 		}
+		else {
+			$message = $('#' + this._messageEditorIDPrefix + $objectID).val();
+		}
 		
 		new WCF.Action.Proxy({
 			autoSend: true,
@@ -1461,7 +1466,7 @@ WCF.Message.InlineEditor = Class.extend({
 		this._container[this._activeElementID].find('.messageOptions').removeClass('forceHidden');
 		
 		// remove editor
-		if (!$.browser.mobile) {
+		if ($.browser.ckeditor) {
 			var $ckEditor = $('#' + this._messageEditorIDPrefix + $container.data('objectID')).ckeditorGet();
 			$ckEditor.destroy();
 		}
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 3a33018b9b..55da2936df 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -156,6 +156,9 @@ String.prototype.hashCode = function() {
 	
 	// detect smartphones
 	jQuery.browser.smartphone = ($('html').css('caption-side') == 'bottom');
+	
+	// CKEditor support (disabled for Android & Windows Phone)
+	jQuery.browser.ckeditor = (navigator.userAgent.match(/(Android|Windows Phone)/i)) ? false : true;
 })();
 
 /**
-- 
2.20.1