jonny
/
Vector-Local
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Technical: Use unambigious menu template 

Follow up to 49c8b5f514
Our PHP parser resolves >Menu to the parent directory which
differs from the frontend Mustache library.

Best to have different names for these files to avoid this problem.

Bug: T311319
Change-Id: Iea708718a0b928c4902dc7bac0c5ee304b89f961
This commit is contained in:
Jon Robson 2022-06-24 17:18:17 -07:00
parent a34b564192
commit 6efcf775c0
10 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
includes/templates/legacy/Menu.mustache → includes/templates/LegacyMenu.mustache
View File

13
includes/templates/LegacySidebar.mustache Normal file
View File

@ -0,0 +1,13 @@
{{!
See @typedef SidebarData
}}
<div id="mw-panel">
<div id="p-logo" role="banner">
<a class="mw-wiki-logo" href="{{link-mainpage}}"
title="{{msg-tooltip-p-logo}}"></a>
</div>
{{#data-portlets-first}}{{>LegacyMenu}}{{/data-portlets-first}}
{{#array-portlets-rest}}{{>LegacyMenu}}{{/array-portlets-rest}}
{{#data-portlets.data-languages}}{{>LegacyMenu}}{{/data-portlets.data-languages}}
</div>

1
includes/templates/LegacyUserLinks.mustache Normal file
View File

@ -0,0 +1 @@
{{#data-personal}}{{>LegacyMenu}}{{/data-personal}}

13
includes/templates/legacy/Sidebar.mustache
View File

@ -1,13 +0,0 @@
{{!
See @typedef SidebarData
}}
<div id="mw-panel">
<div id="p-logo" role="banner">
<a class="mw-wiki-logo" href="{{link-mainpage}}"
title="{{msg-tooltip-p-logo}}"></a>
</div>
{{#data-portlets-first}}{{>Menu}}{{/data-portlets-first}}
{{#array-portlets-rest}}{{>Menu}}{{/array-portlets-rest}}
{{#data-portlets.data-languages}}{{>Menu}}{{/data-portlets.data-languages}}
</div>

1
includes/templates/legacy/UserLinks.mustache
View File

@ -1 +0,0 @@
{{#data-personal}}{{>legacy/Menu}}{{/data-personal}}

12
includes/templates/skin-legacy.mustache
View File

@ -52,18 +52,18 @@
<h2>{{msg-navigation-heading}}</h2>
<div id="mw-head">
{{#data-portlets}}
{{>legacy/UserLinks}}
{{>LegacyUserLinks}}
<div id="left-navigation">
{{#data-namespaces}}{{>legacy/Menu}}{{/data-namespaces}}
{{#data-variants}}{{>legacy/Menu}}{{/data-variants}}
{{#data-namespaces}}{{>LegacyMenu}}{{/data-namespaces}}
{{#data-variants}}{{>LegacyMenu}}{{/data-variants}}
</div>
<div id="right-navigation">
{{#data-views}}{{>legacy/Menu}}{{/data-views}}
{{#data-actions}}{{>legacy/Menu}}{{/data-actions}}
{{#data-views}}{{>LegacyMenu}}{{/data-views}}
{{#data-actions}}{{>LegacyMenu}}{{/data-actions}}
{{#data-search-box}}{{>SearchBox}}{{/data-search-box}}
</div>
{{/data-portlets}}
</div>
{{#data-portlets-sidebar}}{{>legacy/Sidebar}}{{/data-portlets-sidebar}}
{{#data-portlets-sidebar}}{{>LegacySidebar}}{{/data-portlets-sidebar}}
</div>
{{#data-footer}}{{>Footer}}{{/data-footer}}

3
stories/Menu.stories.data.js
View File

@ -1,4 +1,5 @@
import menuTemplate from '!!raw-loader!../includes/templates/Menu.mustache';
import legacyMenuTemplate from '!!raw-loader!../includes/templates/LegacyMenu.mustache';
import { helperMakeMenuData } from './utils';
/**
@ -11,4 +12,4 @@ const defaultMenu = helperMakeMenuData(
<li><a href='#'>Item 3</a></li>`
);
export { menuTemplate, defaultMenu };
export { menuTemplate, legacyMenuTemplate, defaultMenu };

2
stories/Sidebar.stories.data.js
View File

@ -1,5 +1,5 @@
import sidebarTemplate from '!!raw-loader!../includes/templates/Sidebar.mustache';
import sidebarLegacyTemplate from '!!raw-loader!../includes/templates/legacy/Sidebar.mustache';
import sidebarLegacyTemplate from '!!raw-loader!../includes/templates/LegacySidebar.mustache';
import { vectorMenuTemplate } from './MenuDropdown.stories.data';
import { PORTALS } from './MenuPortal.stories.data';

2
stories/UserLinks.stories.data.js
View File

@ -1,7 +1,7 @@
import msgs from '../i18n/en.json';
import mustache from 'mustache';
import { menuTemplate } from './Menu.stories.data';
import userLinksTemplateLegacy from '!!raw-loader!../includes/templates/legacy/UserLinks.mustache';
import userLinksTemplateLegacy from '!!raw-loader!../includes/templates/LegacyUserLinks.mustache';
import userLinksTemplate from '!!raw-loader!../includes/templates/UserLinks.mustache';
import userLinksMoreTemplate from '!!raw-loader!../includes/templates/UserLinks__more.mustache';
import userLinksLogoutTemplate from '!!raw-loader!../includes/templates/UserLinks__logout.mustache';

7
stories/skin.stories.data.js
View File

@ -2,7 +2,7 @@ import { htmlUserLanguageAttributes } from './utils';
import { placeholder } from './utils';
import { userLinksTemplateLegacy } from './UserLinks.stories.data';
import { menuTemplate } from './Menu.stories.data';
import { menuTemplate, legacyMenuTemplate } from './Menu.stories.data';
import { PERSONAL_MENU_TEMPLATE_DATA } from './UserLinks.stories.data';
import { pageActionsData, namespaceTabsData } from './MenuTabs.stories.data';
import { vectorMenuTemplate, moreData, variantsData } from './MenuDropdown.stories.data';
@ -55,11 +55,12 @@ export const NAVIGATION_TEMPLATE_DATA = {
export const TEMPLATE_PARTIALS = Object.assign( {}, SIDEBAR_TEMPLATE_PARTIALS, {
Logo: logoTemplate,
SearchBox: searchBoxTemplate,
'legacy/Sidebar': sidebarLegacyTemplate,
LegacySidebar: sidebarLegacyTemplate,
Sidebar: sidebarTemplate,
LegacyMenu: legacyMenuTemplate,
VectorMenu: vectorMenuTemplate,
Menu: menuTemplate,
'legacy/UserLinks': userLinksTemplateLegacy,
LegacyUserLinks: userLinksTemplateLegacy,
Footer: footerTemplate
}, FOOTER_TEMPLATE_PARTIALS, SEARCH_TEMPLATE_PARTIALS );