https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111872
Revision: 111872
Author: yaron
Date: 2012-02-19 17:06:06 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
Changed name and ID of free text input from 'free_text' to 'sf_free_text', to
minimize the chance of a collision with a section header, if FCKeditor is being
used
Modified Paths:
--------------
trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
trunk/extensions/SemanticForms/includes/SF_FormUtils.php
trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
trunk/extensions/SemanticForms/includes/forminputs/SF_TextAreaInput.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2012-02-19
16:54:21 UTC (rev 111871)
+++ trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2012-02-19
17:06:06 UTC (rev 111872)
@@ -359,8 +359,8 @@
$original_page_content = $existing_page_content;
} else {
$original_page_content = null;
- if ( $wgRequest->getCheck( 'free_text' ) ) {
- $existing_page_content = $wgRequest->getVal(
'free_text' );
+ if ( $wgRequest->getCheck( 'sf_free_text' ) ) {
+ $existing_page_content = $wgRequest->getVal(
'sf_free_text' );
$form_is_partial = true;
}
}
@@ -951,7 +951,7 @@
// the page, using <free_text>
tags - once all the free text
// is known (at the end), it
will get substituted in.
if ( $is_hidden ) {
- $new_text =
Html::hidden( 'free_text', '!free_text!' );
+ $new_text =
Html::hidden( 'sf_free_text', '!free_text!' );
} else {
$sfgTabIndex++;
$sfgFieldNum++;
@@ -970,7 +970,7 @@
}
}
}
- $new_text =
SFTextAreaInput::getHTML( $default_value, 'free_text', false, (
$form_is_disabled || $is_restricted ), $field_args );
+ $new_text =
SFTextAreaInput::getHTML( $default_value, 'sf_free_text', false, (
$form_is_disabled || $is_restricted ), $field_args );
if ( in_array(
'edittools', $free_text_components ) ) {
// borrowed
from EditPage::showEditTools()
$options[] =
'parse';
@@ -1228,7 +1228,7 @@
// reason don't submit their
value.
if ( $form_field->isDisabled()
) {
if ( $field_name ==
'free text' || $field_name == '<freetext>' ) {
- $new_text .=
Html::hidden( 'free_text', '!free_text!' );
+ $new_text .=
Html::hidden( 'sf_free_text', '!free_text!' );
} else {
$new_text .=
Html::hidden( $input_name, $cur_value );
}
@@ -1463,7 +1463,7 @@
// if it wasn't included in the form definition, add the
// 'free text' input as a hidden field at the bottom
if ( ! $free_text_was_included ) {
- $form_text .= Html::hidden( 'free_text', '!free_text!'
);
+ $form_text .= Html::hidden( 'sf_free_text',
'!free_text!' );
}
// Get free text, and add to page data, as well as retroactively
// inserting it into the form.
@@ -1487,8 +1487,8 @@
// page hasn't already been inserted into the form
$free_text = trim( $existing_page_content );
// or get it from a form submission
- } elseif ( $wgRequest->getCheck( 'free_text' ) ) {
- $free_text = $wgRequest->getVal( 'free_text' );
+ } elseif ( $wgRequest->getCheck( 'sf_free_text' ) ) {
+ $free_text = $wgRequest->getVal( 'sf_free_text' );
if ( ! $free_text_was_included ) {
$data_text .= "!free_text!";
}
Modified: trunk/extensions/SemanticForms/includes/SF_FormUtils.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormUtils.php 2012-02-19
16:54:21 UTC (rev 111871)
+++ trunk/extensions/SemanticForms/includes/SF_FormUtils.php 2012-02-19
17:06:06 UTC (rev 111872)
@@ -443,7 +443,7 @@
}
$javascript_text .= <<<END
-var oFCKeditor = new FCKeditor( "free_text" );
+var oFCKeditor = new FCKeditor( "sf_free_text" );
//Set config
oFCKeditor.BasePath = '$wgScriptPath/$wgFCKEditorDir';
@@ -478,7 +478,7 @@
return y;
}
function getWindowHeight4editor() {
- var fsize = getFontSize('free_text');
+ var fsize = getFontSize('sf_free_text');
// if value was not determined, return default val from
$wgFCKEditorHeight
if (!fsize) return $FCKEditorHeight;
if (fsize.indexOf('px') == -1) // we didn't get pixels
@@ -495,7 +495,7 @@
if (!(showFCKEditor & RTE_VISIBLE))
showFCKEditor += RTE_VISIBLE;
firstLoad = false;
- realTextarea = document.getElementById('free_text');
+ realTextarea = document.getElementById('sf_free_text');
if ( realTextarea )
{
// Create the editor instance and replace the textarea.
@@ -522,7 +522,7 @@
// if we have FCK enabled, behave differently...
if ( showFCKEditor & RTE_VISIBLE )
{
- SRCiframe = oDoc.getElementById
('free_text___Frame') ;
+ SRCiframe = oDoc.getElementById
('sf_free_text___Frame') ;
if ( SRCiframe )
{
if (window.frames[SRCiframe])
@@ -545,7 +545,7 @@
}
else
{
- txtarea = oDoc.editform.free_text ;
+ txtarea = oDoc.editform.sf_free_text ;
}
}
else
@@ -642,24 +642,24 @@
}
function initEditor()
{
- var toolbar = document.getElementById('free_text');
+ var toolbar = document.getElementById('sf_free_text');
//show popup or toogle link
if (showFCKEditor & (RTE_POPUP|RTE_TOGGLE_LINK)){
var fckTools = document.createElement('div');
fckTools.setAttribute('id', 'fckTools');
- var SRCtextarea = document.getElementById( "free_text" ) ;
+ var SRCtextarea = document.getElementById( "sf_free_text" ) ;
if (showFCKEditor & RTE_VISIBLE) SRCtextarea.style.display =
"none";
}
if (showFCKEditor & RTE_TOGGLE_LINK)
{
- fckTools.innerHTML='[<a class="fckToogle" id="toggle_free_text"
href="javascript:void(0)"
onclick="ToggleFCKEditor(\'toggle\',\'free_text\')">'+ editorLink +'</a>] ';
+ fckTools.innerHTML='[<a class="fckToogle"
id="toggle_sf_free_text" href="javascript:void(0)"
onclick="ToggleFCKEditor(\'toggle\',\'sf_free_text\')">'+ editorLink +'</a>] ';
}
if (showFCKEditor & RTE_POPUP)
{
var style = (showFCKEditor & RTE_VISIBLE) ?
'style="display:none"' : "";
- fckTools.innerHTML+='<span ' + style + '
id="popup_free_text">[<a class="fckPopup" href="javascript:void(0)"
onclick="ToggleFCKEditor(\'popup\',\'free_text\')">{$newWinMsg}</a>]</span>';
+ fckTools.innerHTML+='<span ' + style + '
id="popup_sf_free_text">[<a class="fckPopup" href="javascript:void(0)"
onclick="ToggleFCKEditor(\'popup\',\'sf_free_text\')">{$newWinMsg}</a>]</span>';
}
if (showFCKEditor & (RTE_POPUP|RTE_TOGGLE_LINK)){
Modified: trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
2012-02-19 16:54:21 UTC (rev 111871)
+++ trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
2012-02-19 17:06:06 UTC (rev 111872)
@@ -137,6 +137,7 @@
$parser->setFunctionHook( 'forminput', array(
'SFParserFunctions', 'renderFormInput' ) );
$parser->setFunctionHook( 'formlink', array(
'SFParserFunctions', 'renderFormLink' ) );
+ $parser->setFunctionHook( 'queryformlink', array(
'SFParserFunctions', 'renderQueryFormLink' ) );
if ( defined( get_class( $parser ) . '::SFH_OBJECT_ARGS' ) ) {
$parser->setFunctionHook( 'arraymap', array(
'SFParserFunctions', 'renderArrayMapObj' ), SFH_OBJECT_ARGS );
$parser->setFunctionHook( 'arraymaptemplate', array(
'SFParserFunctions', 'renderArrayMapTemplateObj' ), SFH_OBJECT_ARGS );
@@ -156,7 +157,6 @@
}
static function renderFormLink ( &$parser ) {
-
$params = func_get_args();
array_shift( $params ); // We don't need the parser.
@@ -165,6 +165,15 @@
return $parser->insertStripItem( SFUtils::createFormLink(
$parser, 'FormEdit', $params ), $parser->mStripState );
}
+ static function renderQueryFormLink ( &$parser ) {
+ $params = func_get_args();
+ array_shift( $params ); // We don't need the parser.
+
+ // hack to remove newline from beginning of output, thanks to
+ //
http://jimbojw.com/wiki/index.php?title=Raw_HTML_Output_from_a_MediaWiki_Parser_Function
+ return $parser->insertStripItem( SFUtils::createFormLink(
$parser, 'RunQuery', $params ), $parser->mStripState );
+ }
+
static function renderFormInput ( &$parser ) {
global $wgVersion;
Modified:
trunk/extensions/SemanticForms/includes/forminputs/SF_TextAreaInput.php
===================================================================
--- trunk/extensions/SemanticForms/includes/forminputs/SF_TextAreaInput.php
2012-02-19 16:54:21 UTC (rev 111871)
+++ trunk/extensions/SemanticForms/includes/forminputs/SF_TextAreaInput.php
2012-02-19 17:06:06 UTC (rev 111872)
@@ -36,7 +36,7 @@
global $sfgTabIndex, $sfgFieldNum;
// Use a special ID for the free text field, for FCK's needs.
- $input_id = $input_name == 'free_text' ? 'free_text' :
"input_$sfgFieldNum";
+ $input_id = $input_name == 'sf_free_text' ? 'sf_free_text' :
"input_$sfgFieldNum";
if ( array_key_exists( 'editor', $other_args ) &&
$other_args['editor'] == 'wikieditor' &&
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
