Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94246
Change subject: Minerva: Make it possible to run toggling code on desktop skin
......................................................................
Minerva: Make it possible to run toggling code on desktop skin
Change-Id: I40cb792fdc511d7b823b97573e6b692270b0d928
---
M javascripts/common/application.js
M javascripts/modules/lazyload.js
M javascripts/modules/mf-references.js
M javascripts/modules/mf-toggle.js
4 files changed, 21 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/46/94246/1
diff --git a/javascripts/common/application.js
b/javascripts/common/application.js
index ab36560..8d08aa5 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -50,8 +50,8 @@
}
function preparePageContent( $content ) {
- var $h1s = $content.find( 'h1' ),
- $headings = $h1s.length > 0 ? $h1s : $content.find(
'h2' ),
+ var $h1s = $content.find( '> h1' ),
+ $headings = $h1s.length > 0 ? $h1s : $content.find( '>
h2' ),
tagName = $h1s.length > 0 ? 'h1' : 'h2', sections = [];
// wrap text nodes in spans so that they can be collapsed later
@@ -73,12 +73,21 @@
} );
}
+ function isDesktopSkin() {
+ return !$( 'body' ).hasClass( 'mobile' );
+ }
+
function isBetaGroupMember() {
return mw.config.get( 'wgMFMode' ) === 'beta';
}
function isAlphaGroupMember() {
return mw.config.get( 'wgMFMode' ) === 'alpha';
+ }
+
+ function getContentArea() {
+ // FIXME: Standardise on this element
+ return $( isDesktopSkin() ? '#mw-content-text' : '#content' );
}
// TODO: separate main menu navigation code into separate module
@@ -88,8 +97,8 @@
$doc = $( 'html' ),
$viewport = $( '#mw-mf-viewport' );
- if ( isAlphaGroupMember() && !inNamespace( 'special' ) ) {
- preparePageContent( $( '#content' ) );
+ if ( ( isAlphaGroupMember() || isDesktopSkin() ) &&
!inNamespace( 'special' ) ) {
+ preparePageContent( getContentArea() );
}
$doc.removeClass( 'page-loading' ); // FIXME: Kill with fire.
This is here for historic reasons in case old HTML is cached
@@ -297,12 +306,13 @@
$.extend( M, {
init: init,
inNamespace: inNamespace,
+ getContentArea: getContentArea,
getCurrentPage: getCurrentPage,
jQuery: typeof jQuery !== 'undefined' ? jQuery : false,
getOrigin: getOrigin,
// FIXME: No Page object exists on initial page load but would
be better to make this a function of Page object
getLeadSection: function() {
- return $( '#content div' ).eq( 0 );
+ return M.getContentArea().find( 'div' ).eq( 0 );
},
getSessionId: getSessionId,
isBetaGroupMember: isBetaGroupMember,
diff --git a/javascripts/modules/lazyload.js b/javascripts/modules/lazyload.js
index dd1baaa..5791fd6 100644
--- a/javascripts/modules/lazyload.js
+++ b/javascripts/modules/lazyload.js
@@ -6,7 +6,7 @@
useFuzzyLinkHijacking = M.inNamespace( '' );
if ( history.hijackLinks ) {
- history.hijackLinks( $( '#content' ), useFuzzyLinkHijacking );
+ history.hijackLinks( M.getContentArea(), useFuzzyLinkHijacking
);
M.on( 'section-rendered', function( $container ) {
history.hijackLinks( $container, useFuzzyLinkHijacking
);
diff --git a/javascripts/modules/mf-references.js
b/javascripts/modules/mf-references.js
index 2f8e008..ac96a1b 100644
--- a/javascripts/modules/mf-references.js
+++ b/javascripts/modules/mf-references.js
@@ -23,7 +23,7 @@
}
function setup( $container ) {
- $container = $container || $( '#content' );
+ $container = $container || M.getContentArea();
$container.find( 'sup a' ).off( 'click' ).on( 'click',
showReference );
$container.find( '.mw-cite-backlink a' ).off( 'click' );
}
diff --git a/javascripts/modules/mf-toggle.js b/javascripts/modules/mf-toggle.js
index 4963105..0d6535d 100644
--- a/javascripts/modules/mf-toggle.js
+++ b/javascripts/modules/mf-toggle.js
@@ -46,13 +46,13 @@
}
function init() {
- var $page = $( '#content' ), tagName = 'h2', $headings;
+ var $page = M.getContentArea(), selector = '> h2', $headings;
$( 'html' ).removeClass( 'stub' );
- if ( $page.find( 'h1' ).length > 0 ) {
- tagName = 'h1';
+ if ( $page.find( '> h1' ).length > 0 ) {
+ selector = '> h1';
}
- $page.find( tagName ).addClass( 'section_heading' );
+ $page.find( selector ).addClass( 'section_heading' );
$headings = $page.find( '.section_heading' );
$headings.next( 'div' ).addClass( 'content_block' );
--
To view, visit https://gerrit.wikimedia.org/r/94246
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40cb792fdc511d7b823b97573e6b692270b0d928
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
