Merge "Remove VectorBeforeFooter hook"

This commit is contained in:
jenkins-bot 2020-08-13 22:36:09 +00:00 committed by Gerrit Code Review
commit feae33a4e6
4 changed files with 2 additions and 16 deletions

View File

@ -221,17 +221,7 @@ class SkinVector extends SkinMustache {
}
}
ob_start();
Hooks::run( 'VectorBeforeFooter', [], '1.35' );
$htmlHookVectorBeforeFooter = ob_get_contents();
ob_end_clean();
$data = [
'html-hook-vector-before-footer' => $htmlHookVectorBeforeFooter,
'array-footer-rows' => $footerRows,
];
return $data;
return [ 'array-footer-rows' => $footerRows ];
}
/**

View File

@ -9,11 +9,9 @@
@prop string id of list element
@prop footerItem[] array-items
string html-hook-vector-before-footer output of VectorBeforeFooter hook
string|null html-user-language-attributes a string of attribute HTML
footerRow[] array-footer-rows iterable list of footer rows
}}
{{{html-hook-vector-before-footer}}}
{{! `role` is unnecessary but kept to support selectors in any gadgets or user styles and
to mitigate a VoiceOver bug. }}
<footer id="footer" class="mw-footer" role="contentinfo" {{{html-user-language-attributes}}}>

View File

@ -1,6 +1,6 @@
/* eslint-disable quotes */
import { htmlUserLanguageAttributes, placeholder } from './utils';
import { htmlUserLanguageAttributes } from './utils';
import footerTemplate from '!!raw-loader!../includes/templates/Footer.mustache';
const FOOTER_ROWS = [
@ -75,6 +75,5 @@ export { footerTemplate };
export const FOOTER_TEMPLATE_DATA = {
'html-user-language-attributes': htmlUserLanguageAttributes,
'html-hook-vector-before-footer': placeholder( 'output of VectorBeforeFooter hook (deprecated 1.35)', 20 ),
'array-footer-rows': FOOTER_ROWS
};

View File

@ -102,7 +102,6 @@ export const LEGACY_TEMPLATE_DATA = {
'html-categories': placeholder( 'Category links component from mediawiki core', 50 ),
// extension dependent..
'html-hook-vector-before-footer': placeholder( 'VectorBeforeFooter hook output', 100 ),
'html-after-content': placeholder( 'Extensions can add here e.g. Related Articles.', 100 ),
'array-indicators': DATA_INDICATORS,
'html-subtitle': placeholder( 'Extensions can configure subtitle', 20 )