jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Put TableOfContents in own file
......................................................................
Hygiene: Put TableOfContents in own file
Change-Id: Ie45747ec885e17775e30cb559756d1c489c407c0
---
M includes/Resources.php
A javascripts/loggingSchemas/init.js
A javascripts/modules/toc/TableOfContents.js
M javascripts/modules/toc/init.js
4 files changed, 41 insertions(+), 35 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
Bmansurov: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index cabbd84..02d21bd 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -109,6 +109,7 @@
'mobile.toggling',
),
'scripts' => array(
+ 'javascripts/modules/toc/TableOfContents.js',
'javascripts/modules/toc/init.js',
),
'styles' => array(
diff --git a/javascripts/loggingSchemas/init.js
b/javascripts/loggingSchemas/init.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/javascripts/loggingSchemas/init.js
diff --git a/javascripts/modules/toc/TableOfContents.js
b/javascripts/modules/toc/TableOfContents.js
new file mode 100644
index 0000000..eb8295b
--- /dev/null
+++ b/javascripts/modules/toc/TableOfContents.js
@@ -0,0 +1,39 @@
+( function ( M ) {
+ var TableOfContents,
+ MobileWebClickTracking = M.require(
'loggingSchemas/MobileWebClickTracking' ),
+ View = M.require( 'View' ),
+ Icon = M.require( 'Icon' );
+
+ /**
+ * View for table of contents
+ * @class TableOfContents
+ * @extends View
+ */
+ TableOfContents = View.extend( {
+ templatePartials: {
+ tocHeading: mw.template.get( 'mobile.toc',
'heading.hogan' )
+ },
+ defaults: {
+ tocIcon: new Icon( { tagName: 'span',
+ name: 'toc', additionalClasses: 'icon-16px'
+ } ).toHtmlString(),
+ contentsMsg: mw.msg( 'toc' )
+ },
+ tagName: 'div',
+ className: 'toc-mobile',
+ template: mw.template.get( 'mobile.toc', 'toc.hogan' ),
+ postRender: function () {
+ var log = MobileWebClickTracking.log;
+ View.prototype.postRender.apply( this, arguments );
+ // Click tracking for table of contents so we can see
if people interact with it
+ this.$( 'h2' ).on( 'click', function () {
+ log( 'page-toc-toggle' );
+ } );
+ this.$( 'a' ).on( 'click', function () {
+ log( 'page-toc-link' );
+ } );
+ }
+ } );
+
+ M.define( 'modules/toc/TableOfContents', TableOfContents );
+}( mw.mobileFrontend ) );
diff --git a/javascripts/modules/toc/init.js b/javascripts/modules/toc/init.js
index f99bde4..49c065f 100644
--- a/javascripts/modules/toc/init.js
+++ b/javascripts/modules/toc/init.js
@@ -1,40 +1,6 @@
( function ( M ) {
- var View = M.require( 'View' ), TableOfContents,
- Icon = M.require( 'Icon' ),
- MobileWebClickTracking = M.require(
'loggingSchemas/MobileWebClickTracking' ),
+ var TableOfContents = M.require( 'modules/toc/TableOfContents' ),
toggle = M.require( 'toggle' );
-
- /**
- * View for table of contents
- * @class TableOfContents
- * @extends View
- */
- TableOfContents = View.extend( {
- templatePartials: {
- tocHeading: mw.template.get( 'mobile.toc',
'heading.hogan' )
- },
- defaults: {
- tocIcon: new Icon( { tagName: 'span',
- name: 'toc', additionalClasses: 'icon-16px'
- } ).toHtmlString(),
- contentsMsg: mw.msg( 'toc' )
- },
- tagName: 'div',
- className: 'toc-mobile',
- template: mw.template.get( 'mobile.toc', 'toc.hogan' ),
- postRender: function () {
- var log = MobileWebClickTracking.log;
- View.prototype.postRender.apply( this, arguments );
- // Click tracking for table of contents so we can see
if people interact with it
- this.$( 'h2' ).on( 'click', function () {
- log( 'page-toc-toggle' );
- } );
- this.$( 'a' ).on( 'click', function () {
- log( 'page-toc-link' );
- } );
- }
- } );
- M.define( 'modules/toc/TableOfContents', TableOfContents );
function init( page ) {
var toc, sections = page.getSubSections(), enableToc =
mw.config.get( 'wgTOC' );
--
To view, visit https://gerrit.wikimedia.org/r/172458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie45747ec885e17775e30cb559756d1c489c407c0
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
