| Index: trunk/extensions/SemanticForms/includes/SF_FormUtils.inc |
| — | — | @@ -70,13 +70,13 @@ |
| 71 | 71 | static function validationJavascript() { |
| 72 | 72 | global $sfgJSValidationCalls; |
| 73 | 73 | |
| 74 | | - $form_errors_header = wfMsg('sf_formerrors_header'); |
| 75 | | - $blank_error_str = wfMsg('sf_blank_error'); |
| 76 | | - $bad_url_error_str = wfMsg('sf_bad_url_error'); |
| 77 | | - $bad_email_error_str = wfMsg('sf_bad_email_error'); |
| 78 | | - $bad_number_error_str = wfMsg('sf_bad_number_error'); |
| 79 | | - $bad_integer_error_str = wfMsg('sf_bad_integer_error'); |
| 80 | | - $bad_date_error_str = wfMsg('sf_bad_date_error'); |
| | 74 | + $form_errors_header = Xml::escapeJsString(wfMsg('sf_formerrors_header')); |
| | 75 | + $blank_error_str = Xml::escapeJsString(wfMsg('sf_blank_error')); |
| | 76 | + $bad_url_error_str = Xml::escapeJsString(wfMsg('sf_bad_url_error')); |
| | 77 | + $bad_email_error_str = Xml::escapeJsString(wfMsg('sf_bad_email_error')); |
| | 78 | + $bad_number_error_str = Xml::escapeJsString(wfMsg('sf_bad_number_error')); |
| | 79 | + $bad_integer_error_str = Xml::escapeJsString(wfMsg('sf_bad_integer_error')); |
| | 80 | + $bad_date_error_str = Xml::escapeJsString(wfMsg('sf_bad_date_error')); |
| 81 | 81 | |
| 82 | 82 | $javascript_text =<<<END |
| 83 | 83 | |
| — | — | @@ -920,12 +920,12 @@ |
| 921 | 921 | |
| 922 | 922 | if (showFCKEditor & RTE_TOGGLE_LINK) |
| 923 | 923 | { |
| 924 | | - fckTools.innerHTML='[<a class="fckToogle" id="toggle_wpTextbox1" href="javascript:void(0)" onclick="ToggleFCKEditor(\'toggle\',\'free_text\')">'+ editorLink +'</a>] '; |
| | 924 | + fckTools.innerHTML='[<a class="fckToogle" id="toggle_free_text" href="javascript:void(0)" onclick="ToggleFCKEditor(\'toggle\',\'free_text\')">'+ editorLink +'</a>] '; |
| 925 | 925 | } |
| 926 | 926 | if (showFCKEditor & RTE_POPUP) |
| 927 | 927 | { |
| 928 | 928 | var style = (showFCKEditor & RTE_VISIBLE) ? 'style="display:none"' : ""; |
| 929 | | - fckTools.innerHTML+='<span ' + style + ' id="popup_wpTextbox1">[<a class="fckPopup" href="javascript:void(0)" onclick="ToggleFCKEditor(\'popup\',\'free_text\')">{$newWinMsg}</a>]</span>'; |
| | 929 | + fckTools.innerHTML+='<span ' + style + ' id="popup_free_text">[<a class="fckPopup" href="javascript:void(0)" onclick="ToggleFCKEditor(\'popup\',\'free_text\')">{$newWinMsg}</a>]</span>'; |
| 930 | 930 | } |
| 931 | 931 | |
| 932 | 932 | if (showFCKEditor & RTE_VISIBLE) |
| — | — | @@ -1028,7 +1028,7 @@ |
| 1029 | 1029 | //FCKtoolbar.style.display = 'none'; |
| 1030 | 1030 | oEditorIframe.style.display = ''; |
| 1031 | 1031 | if ( !bIsWysiwyg ) oEditorIns.SwitchEditMode(); //switch to WYSIWYG |
| 1032 | | - showFCKEditor += RTE_VISIBLE; // showFCKEditor+=RTE_VISIBLE |
| | 1032 | + showFCKEditor += RTE_VISIBLE; |
| 1033 | 1033 | if (oToggleLink) oToggleLink.innerHTML = editorMsgOff; |
| 1034 | 1034 | if (oPopupLink) oPopupLink.style.display = 'none'; |
| 1035 | 1035 | } |