Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92555
Change subject: POC: Do section collapsing without wrapping
......................................................................
POC: Do section collapsing without wrapping
TODO:
* Fix ajax page loading
* Make divider hide when section is collapsed
* Fix getLeadSection so it can be queried with find (so things like
clean up templates work)
Bug: 55521
Change-Id: Ic0b6cc56231cd4c998cfa8e43c3033a9c6133d7e
---
M includes/formatters/MobileFormatterHTML.php
M javascripts/common/application.js
M javascripts/modules/mf-toggle.js
M less/common/reset.less
M less/modules/toggle.less
5 files changed, 8 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/55/92555/1
diff --git a/includes/formatters/MobileFormatterHTML.php
b/includes/formatters/MobileFormatterHTML.php
index 58cadd4..18d5d6c 100644
--- a/includes/formatters/MobileFormatterHTML.php
+++ b/includes/formatters/MobileFormatterHTML.php
@@ -1,10 +1,8 @@
<?php
class MobileFormatterHTML extends MobileFormatter {
- protected $pageTransformStart = '<div>';
- protected $pageTransformEnd = '</div>';
- protected $headingTransformStart = '</div>';
- protected $headingTransformEnd = '<div>';
+ protected $headingTransformStart = '<hr class="section-divider"/>';
+ protected $pageTransformEnd = '<hr class="section-divider"/>';
/**
* Constructor
*
diff --git a/javascripts/common/application.js
b/javascripts/common/application.js
index fa00e46..ea28b9b 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -267,7 +267,7 @@
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 $( '.section-divider' ).eq( 0 ).prevAll();
},
getSessionId: getSessionId,
isLoggedIn: isLoggedIn,
diff --git a/javascripts/modules/mf-toggle.js b/javascripts/modules/mf-toggle.js
index 6f28e60..9869d01 100644
--- a/javascripts/modules/mf-toggle.js
+++ b/javascripts/modules/mf-toggle.js
@@ -20,7 +20,7 @@
*/
function toggle( $heading ) {
$heading.toggleClass( 'openSection' );
- $heading.next().toggleClass( 'openSection' );
+ $heading.nextUntil( '.section-divider' ).toggle();
M.emit( 'section-toggle', $heading );
}
@@ -54,7 +54,8 @@
}
$page.find( tagName ).addClass( 'section_heading' );
$headings = $page.find( '.section_heading' );
- $headings.next( 'div' ).addClass( 'content_block' );
+ // collapse the section
+ $headings.nextUntil( '.section-divider' ).hide();
// use mouseup because mousedown blocks the click event and
links
// in headings won't work
diff --git a/less/common/reset.less b/less/common/reset.less
index aaf72e3..6eb6f2c 100644
--- a/less/common/reset.less
+++ b/less/common/reset.less
@@ -21,7 +21,7 @@
font: inherit;
vertical-align: baseline;
}
-button {
+hr, button {
border: none;
background-color: transparent;
}
diff --git a/less/modules/toggle.less b/less/modules/toggle.less
index 5d58611..1b0f8c4 100644
--- a/less/modules/toggle.less
+++ b/less/modules/toggle.less
@@ -6,13 +6,9 @@
*/
@import "../mixins.less";
-.content_block {
- width: 100%; // bug 41401 - without this content doesn't always take up
whole width
-}
-
.client-js {
.section_heading,
- .content_block {
+ .section-divider {
border-bottom: solid 1px @sectionBorderColor;
clear: both;
}
@@ -29,14 +25,6 @@
padding-right: @sectionIconWidth + 15px;
border-bottom: solid 1px @sectionBorderColor;
margin-bottom: @headingMargin;
- }
- }
-
- .content_block {
- display: none;
-
- &.openSection {
- display: block;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/92555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0b6cc56231cd4c998cfa8e43c3033a9c6133d7e
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
