[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix TOC meta item detection

[Esanders (Code Review)]

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360989 )

Change subject: Fix TOC meta item detection
......................................................................

Fix TOC meta item detection

Change-Id: Icce35100bbc0bfb5584a676eec0e1774308d0f68
---
M modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
1 file changed, 16 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/89/360989/1

diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
index 4913b79..b48e6a1 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
@@ -62,13 +62,15 @@
  * @param {ve.dm.MetaItem} metaItem
  */
 ve.ui.MWTocWidget.prototype.onMetaListInsert = function ( metaItem ) {
+       var property;
        // Responsible for adding UI components
-       if ( metaItem instanceof ve.dm.MWTOCForceMetaItem ) {
-               // show
-               this.mwTOCForce = true;
-       } else if ( metaItem instanceof ve.dm.MWTOCDisableMetaItem ) {
-               // hide
-               this.mwTOCDisable = true;
+       if ( metaItem instanceof ve.dm.MWTOCMetaItem ) {
+               property = metaItem.getAttribute( 'property' );
+               if ( property === 'mw:PageProp/forcetoc' ) {
+                       this.mwTOCForce = true;
+               } else if ( property === 'mw:PageProp/notoc' ) {
+                       this.mwTOCDisable = true;
+               }
        }
        this.updateVisibility();
 };
@@ -79,10 +81,14 @@
  * @param {ve.dm.MetaItem} metaItem
  */
 ve.ui.MWTocWidget.prototype.onMetaListRemove = function ( metaItem ) {
-       if ( metaItem instanceof ve.dm.MWTOCForceMetaItem ) {
-               this.mwTOCForce = false;
-       } else if ( metaItem instanceof ve.dm.MWTOCDisableMetaItem ) {
-               this.mwTOCDisable = false;
+       var property;
+       if ( metaItem instanceof ve.dm.MWTOCMetaItem ) {
+               property = metaItem.getAttribute( 'property' );
+               if ( property === 'mw:PageProp/forcetoc' ) {
+                       this.mwTOCForce = false;
+               } else if ( property === 'mw:PageProp/notoc' ) {
+                       this.mwTOCDisable = false;
+               }
        }
        this.updateVisibility();
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/360989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icce35100bbc0bfb5584a676eec0e1774308d0f68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits