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

Bug: T104227
Change-Id: If0e1df48c1b3818235f7e02220144d467fb78fe9
This commit is contained in:
Alex Monk 2015-06-30 19:04:48 +01:00 committed by Jforrester
parent e47587c4ab
commit 5ac5c7a05b
2 changed files with 5 additions and 2 deletions

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 ),

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' );