| Index: trunk/extensions/SemanticForms/includes/SF_FormUtils.php |
| — | — | @@ -10,24 +10,20 @@ |
| 11 | 11 | |
| 12 | 12 | class SFFormUtils { |
| 13 | 13 | static function setGlobalJSVariables( &$vars ) { |
| 14 | | - global $sfgAdderButtons, $sfgRemoverButtons; |
| | 14 | + global $sfgAdderButtons; |
| 15 | 15 | global $sfgAutocompleteMappings, $sfgAutocompleteDataTypes, $sfgAutocompleteValues; |
| 16 | 16 | global $sfgAutocompleteOnAllChars; |
| 17 | | - global $sfgComboBoxInputs, $sfgAutogrowInputs, $sfgFancyBoxInputs; |
| 18 | | - global $sfgJSValidationCalls, $sfgShowOnSelectCalls; |
| | 17 | + global $sfgShowOnSelect; |
| 19 | 18 | |
| 20 | 19 | $vars['sfgRemoveText'] = wfMsg( 'sf_formedit_remove' ); |
| 21 | 20 | $vars['sfgAdderButtons'] = $sfgAdderButtons; |
| 22 | | - $vars['sfgRemoverButtons'] = $sfgRemoverButtons; |
| 23 | 21 | $vars['autocompleteOnAllChars'] = $sfgAutocompleteOnAllChars; |
| 24 | 22 | // variables that are associative arrays need to be cast as |
| 25 | 23 | // objects, to work with MW 1.15 and earlier |
| 26 | 24 | $vars['sfgAutocompleteMappings'] = (object)$sfgAutocompleteMappings; |
| 27 | 25 | $vars['sfgAutocompleteValues'] = (object)$sfgAutocompleteValues; |
| 28 | 26 | $vars['sfgAutocompleteDataTypes'] = (object)$sfgAutocompleteDataTypes; |
| 29 | | - $vars['sfgComboBoxInputs'] = $sfgComboBoxInputs; |
| 30 | | - $vars['sfgAutogrowInputs'] = $sfgAutogrowInputs; |
| 31 | | - $vars['sfgFancyBoxInputs'] = $sfgFancyBoxInputs; |
| | 27 | + $vars['sfgShowOnSelect'] = (object)$sfgShowOnSelect; |
| 32 | 28 | $vars['sfgFormErrorsHeader'] = wfMsg( 'sf_formerrors_header' ); |
| 33 | 29 | $vars['sfgBlankErrorStr'] = wfMsg( 'sf_blank_error' ); |
| 34 | 30 | $vars['sfgBadURLErrorStr'] = wfMsg( 'sf_bad_url_error' ); |
| — | — | @@ -35,8 +31,6 @@ |
| 36 | 32 | $vars['sfgBadNumberErrorStr'] = wfMsg( 'sf_bad_number_error' ); |
| 37 | 33 | $vars['sfgBadIntegerErrorStr'] = wfMsg( 'sf_bad_integer_error' ); |
| 38 | 34 | $vars['sfgBadDateErrorStr'] = wfMsg( 'sf_bad_date_error' ); |
| 39 | | - $vars['sfgJSValidationCalls'] = $sfgJSValidationCalls; |
| 40 | | - $vars['sfgShowOnSelectCalls'] = $sfgShowOnSelectCalls; |
| 41 | 35 | return true; |
| 42 | 36 | } |
| 43 | 37 | |
| Index: trunk/extensions/SemanticForms/includes/SF_Settings.php |
| — | — | @@ -116,12 +116,7 @@ |
| 117 | 117 | # Global variables for Javascript |
| 118 | 118 | # ## |
| 119 | 119 | $sfgAdderButtons = array(); |
| 120 | | -$sfgRemoverButtons = array(); |
| 121 | | -$sfgShowOnSelectCalls = array(); |
| 122 | | -$sfgJSValidationCalls = array(); |
| | 120 | +$sfgShowOnSelect = array(); |
| 123 | 121 | $sfgAutocompleteMappings = array(); |
| 124 | 122 | $sfgAutocompleteDataTypes = array(); |
| 125 | 123 | $sfgAutocompleteValues = array(); |
| 126 | | -$sfgComboBoxInputs = array(); |
| 127 | | -$sfgAutogrowInputs = array(); |
| 128 | | -$sfgFancyBoxInputs = array(); |