[MediaWiki-commits] [Gerrit] Makes sure to remove the WikiEditor UI - change (mediawiki...ProofreadPage)

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

Change subject: Makes sure to remove the WikiEditor UI
..


Makes sure to remove the WikiEditor UI

Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Task: T138393
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
2 files changed, 7 insertions(+), 3 deletions(-)

Approvals:
  Jforrester: Looks good to me, but someone else must approve
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
index 2803b57..7d8c779 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see 
http://ve.mit-license.org
  */
 
-.ve-init-mw-proofreadPagePageTarget .ve-init-mw-target-surface {
+.prp-page-container .ve-init-mw-target-surface {
float: left;
width: calc( 50% + 1em );
 }
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 6397a92..87c6854 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -15,12 +15,16 @@
  * @param {Object} config Configuration options
  */
 ve.init.mw.ProofreadPagePageTarget = function 
VeInitMwProofreadPagePageTarget() {
-   var zoomIn, zoomReset, zoomOut;
+   var zoomIn, zoomReset, zoomOut, $contentText, $pageContainer;
 
// Parent method
ve.init.mw.ProofreadPagePageTarget.super.apply( this, arguments );
 
-   this.$element.addClass( 've-init-mw-proofreadPagePageTarget' );
+   if ( [ 'edit', 'submit' ].indexOf( mw.config.get( 'wgAction' ) ) !== -1 
) {
+   $contentText = $( '#mw-content-text' );
+   $pageContainer = $contentText.find( '.prp-page-container' );
+   $contentText.empty().append( $pageContainer );
+   }
 
this.$zoomContainer = $( '' ).addClass( 
've-init-mw-proofreadPagePageTarget-zoomContainer' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Makes sure to remove the WikiEditor UI - change (mediawiki...ProofreadPage)

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

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

Change subject: Makes sure to remove the WikiEditor UI
..

Makes sure to remove the WikiEditor UI

Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Task: T138393
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/71/295671/1

diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 40baa84..92f8d13 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -15,12 +15,15 @@
  * @param {Object} config Configuration options
  */
 ve.init.mw.ProofreadPagePageTarget = function 
VeInitMwProofreadPagePageTarget() {
-   var zoomIn, zoomReset, zoomOut;
+   var zoomIn, zoomReset, zoomOut, $contentText;
 
// Parent method
ve.init.mw.ProofreadPagePageTarget.super.apply( this, arguments );
 
-   this.$element.addClass( 've-init-mw-proofreadPagePageTarget' );
+   $contentText = $( '#mw-content-text' );
+   $contentText.html( $contentText.find( '.prp-page-container' ) );
+
+   this.constructor.static.removeWikiEditor();
 
this.$zoomContainer = $( '' ).addClass( 
've-init-mw-proofreadPagePageTarget-zoomContainer' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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