[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: DesktopArticleTarget: clear out originalCategories when they...

2016-12-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: DesktopArticleTarget: clear out originalCategories when they're 
updated
..


DesktopArticleTarget: clear out originalCategories when they're updated

Bug: T152571
Change-Id: I41b5d5aeea0a01cf922924fa1320369d54fef8cf
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



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 783ba95..67f4e5b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -597,7 +597,6 @@
 
// Move original content back out of the target
target.$element.parent().append( 
target.$originalContent.children() );
-   $( '#catlinks' ).replaceWith( target.$originalCategories );
$( '.ve-init-mw-desktopArticleTarget-uneditableContent' )
.off( '.ve-target' )
.removeClass( 
've-init-mw-desktopArticleTarget-uneditableContent' );
@@ -1291,7 +1290,6 @@
this.$originalRedirectMsg = undefined;
this.$originalRedirectSub = undefined;
}
-
if ( this.$originalCategories ) {
$( '#catlinks' ).replaceWith( this.$originalCategories );
}
@@ -1419,9 +1417,12 @@
if ( displayTitle ) {
$( '#content #firstHeading' ).html( displayTitle );
}
+
$categories = $( $.parseHTML( categoriesHtml ) );
mw.hook( 'wikipage.categories' ).fire( $categories );
$( '#catlinks' ).replaceWith( $categories );
+   this.$originalCategories = null;
+
$( '#contentSub' ).html( contentSub );
 
if ( isRedirect ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41b5d5aeea0a01cf922924fa1320369d54fef8cf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: DesktopArticleTarget: clear out originalCategories when they...

2016-12-06 Thread DLynch (Code Review) 
DLynch has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325716

Change subject: DesktopArticleTarget: clear out originalCategories when they're 
updated
..

DesktopArticleTarget: clear out originalCategories when they're updated

Bug: T152571
Change-Id: I41b5d5aeea0a01cf922924fa1320369d54fef8cf
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/16/325716/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 783ba95..da6622b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -597,7 +597,6 @@
 
// Move original content back out of the target
target.$element.parent().append( 
target.$originalContent.children() );
-   $( '#catlinks' ).replaceWith( target.$originalCategories );
$( '.ve-init-mw-desktopArticleTarget-uneditableContent' )
.off( '.ve-target' )
.removeClass( 
've-init-mw-desktopArticleTarget-uneditableContent' );
@@ -1291,7 +1290,6 @@
this.$originalRedirectMsg = undefined;
this.$originalRedirectSub = undefined;
}
-
if ( this.$originalCategories ) {
$( '#catlinks' ).replaceWith( this.$originalCategories );
}
@@ -1419,9 +1417,12 @@
if ( displayTitle ) {
$( '#content #firstHeading' ).html( displayTitle );
}
+
$categories = $( $.parseHTML( categoriesHtml ) );
mw.hook( 'wikipage.categories' ).fire( $categories );
$( '#catlinks' ).replaceWith( $categories );
+   this.$originalCategories = undefined;
+
$( '#contentSub' ).html( contentSub );
 
if ( isRedirect ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41b5d5aeea0a01cf922924fa1320369d54fef8cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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