wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 02:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Show <newarticletext> as surface placeholder, not an edit notice"

Browse source
This commit is contained in:
jenkins-bot 2015-07-01 15:49:12 +00:00 committed by Gerrit Code Review
parent bef186c874 5ac5c7a05b
commit 859f6daee6
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ApiVisualEditor.php
View file

@ -369,8 +369,9 @@ class ApiVisualEditor extends ApiBase {
}
// New page notices
$placeholder = null;
if ( !$title->exists() ) {
$notices[] = $this->msg(
$placeholder = $this->msg(
$user->isLoggedIn() ? 'newarticletext' : 'newarticletextanon',
wfExpandUrl( Skin::makeInternalOrExternalUrl(
$this->msg( 'helppage' )->inContentLanguage()->text()
@ -519,6 +520,7 @@ class ApiVisualEditor extends ApiBase {
$result = array(
'result' => 'success',
'notices' => $notices,
'placeholder' => $placeholder,
'checkboxes' => $checkboxes,
'links' => $links,
'protectedClasses' => implode( ' ', $protectedClasses ),

3
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -313,6 +313,7 @@ ve.init.mw.Target.onLoad = function ( response ) {
this.constructor.static.fixBase( this.doc );
this.remoteNotices = ve.getObjectValues( data.notices );
this.placeholderText = $( $.parseHTML( data.placeholder ) ).text();
this.protectedClasses = data.protectedClasses;
this.$checkboxes = $( ve.getObjectValues( data.checkboxes ).join( '' ) );
// Populate checkboxes with default values for minor and watch
@ -1272,7 +1273,7 @@ ve.init.mw.Target.prototype.setupSurface = function ( doc, callback ) {
// Create ui.Surface (also creates ce.Surface and dm.Surface and builds CE tree)
ve.track( 'trace.createSurface.enter' );
var surface = target.addSurface( dmDoc ),
var surface = target.addSurface( dmDoc, { placeholder: target.placeholderText } ),
surfaceView = surface.getView(),
$documentNode = surfaceView.getDocument().getDocumentNode().$element;
ve.track( 'trace.createSurface.exit' );