jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Clean up arrow logic for toggling
......................................................................
Hygiene: Clean up arrow logic for toggling
Arrow indicator is same regardless.
open-block decides whether it should be facing up or down
Change-Id: I1de4d438e96503a6d8c0410ead4c308ae1ca8442
---
M resources/mobile.toggle/toggle.js
1 file changed, 6 insertions(+), 11 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.toggle/toggle.js
b/resources/mobile.toggle/toggle.js
index f5a5430..9b600ed 100644
--- a/resources/mobile.toggle/toggle.js
+++ b/resources/mobile.toggle/toggle.js
@@ -3,11 +3,7 @@
settings = M.require( 'mobile.settings/settings' ),
browser = M.require( 'mobile.browser/browser' ),
escapeHash = M.require( 'mobile.startup/util' ).escapeHash,
- arrowUpOptions = {
- name: 'arrow',
- additionalClassNames: 'indicator'
- },
- arrowDownOptions = {
+ arrowOptions = {
name: 'arrow',
additionalClassNames: 'indicator'
},
@@ -156,20 +152,19 @@
* @ignore
*/
Toggler.prototype.toggle = function ( $heading ) {
- var wasExpanded = $heading.is( '.open-block' ),
+ var indicator,
+ wasExpanded = $heading.is( '.open-block' ),
page = $heading.data( 'page' ),
- sectionId = $heading.data( 'section-number' ),
- options, indicator;
+ sectionId = $heading.data( 'section-number' );
$heading.toggleClass( 'open-block' );
$heading.data( 'indicator' ).remove();
- options = wasExpanded ? arrowDownOptions : arrowUpOptions;
/**
* @event toggled
*/
this.emit( 'toggled', wasExpanded, sectionId );
- indicator = new Icon( options ).prependTo( $heading );
+ indicator = new Icon( arrowOptions ).prependTo( $heading );
$heading.data( 'indicator', indicator );
$heading.next()
@@ -290,7 +285,7 @@
self.toggle.call( self,
$( this ) );
}
} );
- indicator = new Icon( arrowDownOptions
).prependTo( $heading );
+ indicator = new Icon( arrowOptions ).prependTo(
$heading );
$heading.data( 'indicator', indicator );
$heading.next( 'div' )
.addClass( 'collapsible-block' )
--
To view, visit https://gerrit.wikimedia.org/r/259953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1de4d438e96503a6d8c0410ead4c308ae1ca8442
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
