[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Preserve checkbox data when switching from VE to NWE

[Esanders (Code Review)]

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

Change subject: Preserve checkbox data when switching from VE to NWE
......................................................................

Preserve checkbox data when switching from VE to NWE

Bug: T153889
Change-Id: Ifc41ea9320c9f2627efff6f33d4ad87c59fad496
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 8bb7d28..23105d8 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1672,6 +1672,7 @@
                                data.basetimestamp = target.baseTimeStamp;
                                data.starttimestamp = target.startTimeStamp;
                                data.oldid = target.revid;
+                               data.checkboxes = target.checkboxes;
                                return response;
                        } );
                }
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 0a4713e..7589d92 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -272,6 +272,8 @@
                this.startTimeStamp = data.starttimestamp;
                this.revid = data.oldid;
 
+               this.checkboxes = data.checkboxes;
+
                aboutDoc = this.doc.documentElement.getAttribute( 'about' );
                if ( aboutDoc ) {
                        docRevIdMatches = aboutDoc.match( /revision\/([0-9]*)$/ 
);
@@ -327,8 +329,6 @@
                this.documentReady( this.doc );
        }
 
-       data = response ? ( response.visualeditor || response.visualeditoredit 
) : {};
-
        this.checkboxFields = [];
        this.checkboxesByName = {};
        this.$otherFields = $( [] );
@@ -338,13 +338,13 @@
                );
        }
 
-       if ( data.checkboxes ) {
+       if ( this.checkboxes ) {
                defaults = {};
                $( '.editCheckboxes input' ).each( function () {
                        defaults[ this.name ] = this.checked;
                } );
 
-               $checkboxes = $( '<div>' ).html( ve.getObjectValues( 
data.checkboxes ).join( '' ) );
+               $checkboxes = $( '<div>' ).html( ve.getObjectValues( 
this.checkboxes ).join( '' ) );
                $checkboxes.find( 'input[type=checkbox]' ).each( function () {
                        var $label, title, checkbox,
                                $this = $( this ),
@@ -1190,6 +1190,7 @@
        this.submitting = false;
        this.baseTimeStamp = null;
        this.startTimeStamp = null;
+       this.checkboxes = null;
        this.doc = null;
        this.originalHtml = null;
        this.section = null;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc41ea9320c9f2627efff6f33d4ad87c59fad496
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