Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99718
Change subject: [DONT MERGE] mw.Target: Fixup for I55ef2622c9eacc
......................................................................
[DONT MERGE] mw.Target: Fixup for I55ef2622c9eacc
Undo changes that are incorrect or caused a bug:
* Moved call to hidePageContent back (see code comment for why).
* Removed target.surfaceOptions reference because that property
does not exist. We never passed a second argument here, and
whatever this was intended for, doesn't exist.
Don't merge this because this will cause other Target subclasses
that aren't mw.ViewPageTarget to fatally crash as #hidePageContent
is not actually a method that exists on mw.Target.
Change-Id: I230fbd5401cbd6e3b9450c7f156650409be8ef16
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 13 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/18/99718/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index d9e5495..c20aeb0 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -260,11 +260,13 @@
'history': 'updateToolbarSaveButtonState'
} );
this.surface.setPasteRules( this.constructor.static.pasteRules );
+
// Update UI
this.transformPageTitle();
this.changeDocumentTitle();
- this.hidePageContent();
+ // this.hidePageContent(); // Moved to mw.Target#setUpSurface
this.hideSpinner();
+
this.setupToolbarButtons();
this.attachToolbarButtons();
this.restoreScrollPosition();
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 3b8ae6d..21aab03 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1075,7 +1075,7 @@
var dmDoc = ve.dm.converter.getModelFromDom( doc );
setTimeout( function () {
// Create ui.Surface (also creates ce.Surface and
dm.Surface and builds CE tree)
- target.surface = new ve.ui.Surface( dmDoc,
target.surfaceOptions );
+ target.surface = new ve.ui.Surface( dmDoc );
target.surface.$element.addClass(
've-init-mw-viewPageTarget-surface' );
setTimeout( function () {
// Initialize surface
@@ -1083,6 +1083,15 @@
target.$document =
target.surface.$element.find( '.ve-ce-documentNode' );
target.$element.append( target.surface.$element
);
target.setUpToolbar();
+
+ // Hiding of page content must happen here
instead of in mw.ViewPageTarget#onSurfaceReady
+ // because #event-surfaceReady is fired from
#onReady after the document is focussed.
+ // And if we focus our document while the
original php-parser/html is still there, we
+ // will be moving the page view port (scroll)
down to our surface (which is appended in
+ // the page below the native content), and
*then* remove the original content, thus
+ // leaving our scroll position far down the
page (bug 58089).
+ target.hidePageContent();
+
target.$document.attr( {
'lang': mw.config.get( 'wgVisualEditor'
).pageLanguageCode,
'dir': mw.config.get( 'wgVisualEditor'
).pageLanguageDir
--
To view, visit https://gerrit.wikimedia.org/r/99718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I230fbd5401cbd6e3b9450c7f156650409be8ef16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
