Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326439 )
Change subject: Ensure content is selected after async source insert
......................................................................
Ensure content is selected after async source insert
Also remove unnecessary #removeContent in #insertDocument
as it is already done by #insertContent.
Change-Id: Iaa75afb87a3da711fb5bc52eebdbb54bb409780d
---
M src/dm/ve.dm.SourceSurfaceFragment.js
M src/ui/actions/ve.ui.WindowAction.js
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/39/326439/1
diff --git a/src/dm/ve.dm.SourceSurfaceFragment.js
b/src/dm/ve.dm.SourceSurfaceFragment.js
index f0717b9..2ff50bf 100644
--- a/src/dm/ve.dm.SourceSurfaceFragment.js
+++ b/src/dm/ve.dm.SourceSurfaceFragment.js
@@ -120,11 +120,11 @@
this.convertToSource( doc )
.done( function ( source ) {
- fragment.removeContent();
-
if ( source ) {
// Parent method
ve.dm.SourceSurfaceFragment.super.prototype.insertContent.call( fragment,
source.trim() );
+ } else {
+ fragment.removeContent();
}
} )
.fail( function () {
diff --git a/src/ui/actions/ve.ui.WindowAction.js
b/src/ui/actions/ve.ui.WindowAction.js
index 3fd3898..8e6bfe2 100644
--- a/src/ui/actions/ve.ui.WindowAction.js
+++ b/src/ui/actions/ve.ui.WindowAction.js
@@ -137,6 +137,8 @@
surface.getModel().undo();
}
if ( sourceMode &&
fragment && fragment.getSurface().hasBeenModified() ) {
+ // Action may
be async, so we use auto select to ensure the content is selected
+
originalFragment.setAutoSelect( true );
originalFragment.insertDocument( fragment.getDocument() );
}
surface.getView().emit(
'position' );
--
To view, visit https://gerrit.wikimedia.org/r/326439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa75afb87a3da711fb5bc52eebdbb54bb409780d
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
