Item2476: Rework the solution so it doesn't use ADDTOHEAD (IE8's comp…

…at tag isn't useful unless in a specific place in the HEAD). git-svn-id: http://svn.foswiki.org/branches/Release01x00@5784 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 13, 2009 · fd96c1a · fd96c1a
1 parent f9f0e2c
commit fd96c1a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/PatternSkin/templates/foswiki.pattern.tmpl b/PatternSkin/templates/foswiki.pattern.tmpl
@@ -26,6 +26,7 @@
 
 %TMPL:DEF{"head"}%<head>
 %TMPL:P{"windowtitle"}%
+%TMPL:P{context="edit" then="ie8compatibilitymode"}%
 <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
 <link rel="icon" href="%FAVICON%" type="image/x-icon" />
 <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
@@ -74,4 +75,4 @@
 
 %TMPL:DEF{"bodyend"}%</body></html>%TMPL:END%
 
-%TMPL:DEF{"textareabuttons"}%<span class="foswikiRight foswikiMakeVisible" style="text-align:left; margin:0 0 0 1em;"><span class="foswikiLeft patternTextareaButton patternButtonFontSelector" title="%MAKETEXT{"Switch to monotype or propotional font"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonEnlarge" title="%MAKETEXT{"Enlarge edit box"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonShrink" title="%MAKETEXT{"Shrink edit box"}%">&nbsp;</span></span>%TMPL:END%
+%TMPL:DEF{"textareabuttons"}%<span class="foswikiRight foswikiMakeVisible" style="text-align:left; margin:0 0 0 1em;"><span class="foswikiLeft patternTextareaButton patternButtonFontSelector" title="%MAKETEXT{"Switch to monotype or propotional font"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonEnlarge" title="%MAKETEXT{"Enlarge edit box"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonShrink" title="%MAKETEXT{"Shrink edit box"}%">&nbsp;</span></span>%TMPL:END%
diff --git a/core/templates/edit.tmpl b/core/templates/edit.tmpl
@@ -12,10 +12,8 @@
 %TMPL:DEF{"help"}%%INCLUDE{"%SYSTEMWEB%.%IF{"defined 'EDITOR_HELP'" then="%EDITOR_HELP%" else="WikiSyntaxSummary"}%"}%%TMPL:END%
 
 %{ if an editor plugin sets EDITOR_MESSAGE, then use it }%
-%TMPL:DEF{"textarea"}%%TMPL:P{"forceie8compatibilitymode"}%%IF{"defined 'EDITOR_MESSAGE'" then="<div class='foswikiAlert'>%EDITOR_MESSAGE%</div>"}%<div class="foswikiEditTextarea"><textarea class="foswikiTextarea foswikiEditboxStyleProportional foswikiWysiwygEdit" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%'>%TEXT%</textarea></div><!--/foswikiEditTextarea-->%TMPL:END%
+%TMPL:DEF{"textarea"}%%IF{"defined 'EDITOR_MESSAGE'" then="<div class='foswikiAlert'>%EDITOR_MESSAGE%</div>"}%<div class="foswikiEditTextarea"><textarea class="foswikiTextarea foswikiEditboxStyleProportional foswikiWysiwygEdit" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%'>%TEXT%</textarea></div><!--/foswikiEditTextarea-->%TMPL:END%
 
-%{ Item2476: Put IE8 into compatibility mode to work around slow, erratic textarea }%
-%TMPL:DEF{"forceie8compatibilitymode"}%%ADDTOHEAD{"EDIT_FORCE_IE8_COMPATIBILITYMODE" text="%IF{"$EDIT_FORCE_IE8_COMPATIBILITYMODE='on'" then="<!--[if IE 8]><meta http-equiv='X-UA-Compatible' content='IE=EmulateIE7'/><![endif]-->"}%"}%%TMPL:END%
 
 
 %TMPL:DEF{"form"}%%FORMFIELDS%%TMPL:END%

diff --git a/core/templates/foswiki.tmpl b/core/templates/foswiki.tmpl
@@ -24,8 +24,12 @@
 
 %TMPL:DEF{"windowtitle"}%<title>%TMPL:P{"titleaction"}% <nop>%BASETOPIC%%TMPL:P{"titlesep"}%%BASEWEB%%TMPL:P{"titlesep"}%<nop>%WIKITOOLNAME%</title>%TMPL:END%
 
+%{ Item2476: Put IE8 into compatibility mode to work around slow, erratic textarea }%
+%TMPL:DEF{"ie8compatibilitymode"}%%IF{"$EDIT_FORCE_IE8_COMPATIBILITYMODE='on'" then="<meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\"/>"}%%TMPL:END%
+
 %TMPL:DEF{"head"}%<head>
 	%TMPL:P{"windowtitle"}%
+        %TMPL:P{context="edit" then="ie8compatibilitymode"}%
 	<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" /> <meta name="robots" content="noindex" /> %HTTP_EQUIV_ON_VIEW%
     <meta name="scripturl" content="%SCRIPTURL%" />
     <meta name="scriptsuffix" content="%SCRIPTSUFFIX%" />