From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 14 Nov 2013 19:52:38 +0000 (+0100)
Subject: Enabling CKEditor on Smartphones/Tables except for Android
X-Git-Tag: 2.0.0_RC_2~24
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd372e49d7f003a8aa1a8b1435fc35ae5835cab3;p=GitHub%2FWoltLab%2FWCF.git

Enabling CKEditor on Smartphones/Tables except for Android

Android support is a bit broken right now: http://dev.ckeditor.com/query?status=!closed&keywords=~Android
---

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 17282fcb29..1390d40310 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -11,8 +11,8 @@
 <script data-relocate="true">
 //<![CDATA[
 $(function() {
-	if ($.browser.mobile || navigator.userAgent.match(/[aA]ndroid/)) {
-		// exclude smartphones and Android (not properly supported by CKEditor yet)
+	// exclude Android (not properly supported by CKEditor yet)
+	if (navigator.userAgent.match(/[aA]ndroid/)) {
 		return;
 	}
 	
@@ -49,6 +49,12 @@ $(function() {
 			]
 		{/if}
 	};
+
+	// collapse toolbar on smartphones
+	if ($.browser.mobile && !navigator.userAgent.match(/iPad/)) {
+		$config.toolbarCanCollapse = true;
+		$config.toolbarStartupExpanded = false;
+	}
 	
 	{event name='javascriptInit'}