Merge pull request #1 from dmzx/master

Update from upstream
dmzx · Dec 14, 2015 · 1d9d451 · 1d9d451
2 parents e06fcf2 + 9401072
commit 1d9d451
Show file tree

Hide file tree

Showing 6 changed files with 668 additions and 742 deletions.
diff --git a/styles/prosilver/template/editor.js b/styles/prosilver/template/editor.js
@@ -47,8 +47,7 @@ function initInsertions()
 	if (is_ie && typeof(baseHeight) != 'number')
 	{
 				/* === mChat focus fix Start === */
-				var mChatFocus = window.mChatFocusFix || false;
-				if(!mChatFocus)
+				if(!mChat.focusFix)
 				{
 					textarea.focus();
 				}