Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277840
Change subject: Removal of FIXMEs - time is a great healer
......................................................................
Removal of FIXMEs - time is a great healer
All these FIXMEs can now be removed from the codebase.
Change-Id: I332c1a516d0f2c85d6d5f750787ee36bdd6bf803
---
M includes/skins/history.mustache
M resources/mobile.watchstar/Watchstar.js
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.content.styles/links.less
M resources/skins.minerva.editor/init.js
M resources/skins.minerva.scripts.top/init.js
M resources/skins.minerva.scripts/preInit.js
M resources/skins.minerva.tablet.scripts/toc.js
M resources/skins.minerva.tablet.styles/common.less
M resources/skins.minerva.toggling/init.js
10 files changed, 4 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/40/277840/1
diff --git a/includes/skins/history.mustache b/includes/skins/history.mustache
index d388427..866fd51 100644
--- a/includes/skins/history.mustache
+++ b/includes/skins/history.mustache
@@ -1,5 +1,5 @@
<div class="{{^isMainPage}}last-modified-bar{{/isMainPage}} view-border-box
post-content">
- <div id="mw-mf-last-modified" class="truncated-text
last-modified-bottom">
+ <div id="mw-mf-last-modified" class="truncated-text">
<a href="{{link}}"
data-user-name="{{username}}"
data-user-gender="{{userGender}}"
diff --git a/resources/mobile.watchstar/Watchstar.js
b/resources/mobile.watchstar/Watchstar.js
index 87622e6..a52dafb 100644
--- a/resources/mobile.watchstar/Watchstar.js
+++ b/resources/mobile.watchstar/Watchstar.js
@@ -30,8 +30,6 @@
_super = View,
page = options.page;
- // FIXME: Remove default when Gather has been updated to use
new gateway. (T113753)
- options.api = options.api || new mw.Api();
this.gateway = new WatchstarGateway( options.api );
if ( user.isAnon() ) {
@@ -92,8 +90,6 @@
_super = View.prototype.initialize,
page = options.page;
- // FIXME: Remove default when Gather has been updated
to use new gateway. (T113753)
- options.api = options.api || new mw.Api();
this.gateway = new WatchstarGateway( options.api );
if ( user.isAnon() ) {
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index f17a671..779ad97 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -14,12 +14,6 @@
border-top: 1px solid @grayLight;
}
-// FIXME: remove when cache clears
-.stable .last-modified-bar.pre-content {
- padding: 0 !important;
- margin: 0 auto;
-}
-
.last-modified-bar {
background-color: transparent;
display: block;
diff --git a/resources/skins.minerva.content.styles/links.less
b/resources/skins.minerva.content.styles/links.less
index 14b1ed9..e16554c 100644
--- a/resources/skins.minerva.content.styles/links.less
+++ b/resources/skins.minerva.content.styles/links.less
@@ -38,10 +38,6 @@
#mw-mf-last-modified {
display: block;
font-size: .9em;
- // FIXME: instances of .last-modified-bottom can be completely removed
after cache expires. (T104697)
- &.last-modified-bottom {
- margin-top: 1.5em;
- }
}
/* Plainlinks - this can be used to switch
diff --git a/resources/skins.minerva.editor/init.js
b/resources/skins.minerva.editor/init.js
index cd474a2..ddda74d 100644
--- a/resources/skins.minerva.editor/init.js
+++ b/resources/skins.minerva.editor/init.js
@@ -3,9 +3,7 @@
var
// see:
https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#Page-specific
isEditable = mw.config.get( 'wgIsProbablyEditable' ),
- blockInfo = mw.config.get( 'wgMinervaUserBlockInfo', false ) ||
- // FIXME: Can be removed in 30 days
(Iba351e3285258c07bc11c57fb3255fca916621a4)
- mw.config.get( 'wgMFUserBlockInfo' ),
+ blockInfo = mw.config.get( 'wgMinervaUserBlockInfo', false ),
settings = M.require( 'mobile.settings/settings' ),
router = M.require( 'mobile.startup/router' ),
overlayManager = M.require( 'mobile.startup/overlayManager' ),
diff --git a/resources/skins.minerva.scripts.top/init.js
b/resources/skins.minerva.scripts.top/init.js
index 73fff11..7575755 100644
--- a/resources/skins.minerva.scripts.top/init.js
+++ b/resources/skins.minerva.scripts.top/init.js
@@ -1,7 +1,6 @@
( function ( M, $ ) {
var MainMenu = M.require( 'mobile.mainMenu/MainMenu' ),
- // FIXME: Cleanup when cache clears
- menuData = mw.config.get( 'wgMinervaMenuData' ) ||
mw.config.get( 'wgMFMenuData' ),
+ menuData = mw.config.get( 'wgMinervaMenuData' ),
mainMenu = new MainMenu( $.extend( menuData, {
activator: '.header .main-menu-button'
} ) );
diff --git a/resources/skins.minerva.scripts/preInit.js
b/resources/skins.minerva.scripts/preInit.js
index b34d7ad..88682d0 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -21,15 +21,6 @@
} );
M.define( 'skins.minerva.scripts/skin', skin ).deprecate(
'mobile.startup/skin' );
- // FIXME: remove when cache clears. This is now done in
'skins.minerva.scripts.top/init.js'.
- $( function () {
- if ( !$( '#mw-mf-page-left' ).find( '.menu' ).length ) {
- // Now we have a main menu button register it.
- mainMenu.registerClickEvents();
- mainMenu.appendTo( '#mw-mf-page-left' );
- }
- } );
-
$( window )
.on( 'resize', $.debounce( 100, $.proxy( M, 'emit', 'resize' )
) )
.on( 'scroll', $.debounce( 100, $.proxy( M, 'emit', 'scroll' )
) );
diff --git a/resources/skins.minerva.tablet.scripts/toc.js
b/resources/skins.minerva.tablet.scripts/toc.js
index 704f7ef..4035965 100644
--- a/resources/skins.minerva.tablet.scripts/toc.js
+++ b/resources/skins.minerva.tablet.scripts/toc.js
@@ -13,8 +13,7 @@
var toc, toggle,
sections = page.getSections(),
$toc = $( '#toc' ),
- // FIXME: Remove wgMFTocEnabled when cache expired
- enableToc = mw.config.get( 'wgMinervaTocEnabled' ) ||
mw.config.get( 'wgMFTocEnabled' );
+ enableToc = mw.config.get( 'wgMinervaTocEnabled' );
if ( enableToc ||
// Fallback for old cached HTML, added 26 June, 2014
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 2bb3f6b..e3bdb2e 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -150,8 +150,6 @@
.pre-content,
.post-content,
.content-overlay,
- // FIXME: remove .last-modified-bar when cache clears. The template has
the .post-content class now. (1.26wmf23)
- .last-modified-bar,
// FIXME: remove need for id selector
#mw-mf-page-center .pointer-overlay {
margin-left: auto;
diff --git a/resources/skins.minerva.toggling/init.js
b/resources/skins.minerva.toggling/init.js
index 6813615..834caeb 100644
--- a/resources/skins.minerva.toggling/init.js
+++ b/resources/skins.minerva.toggling/init.js
@@ -18,10 +18,6 @@
new Toggler( $container, prefix, page );
}
- // FIXME: remove when cache clears
- if ( !$contentContainer.length ) {
- $contentContainer = $( '#content #bodyContent' );
- }
// avoid this running on Watchlist
if (
!page.inNamespace( 'special' ) &&
--
To view, visit https://gerrit.wikimedia.org/r/277840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I332c1a516d0f2c85d6d5f750787ee36bdd6bf803
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
