wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-11-27 23:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "VE: Use different approach for transparent text issue"

Browse source
This commit is contained in:
jenkins-bot 2018-03-06 16:35:15 +00:00 committed by Gerrit Code Review
parent 3fc2bc58bc 06af670325
commit c2e1f91c7d
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/modules/ve-cm/ve.ui.CodeMirrorAction.js
View file

@ -163,7 +163,8 @@ ve.ui.CodeMirrorAction.prototype.onLangChange = function () {
* @param {ve.dm.Transaction} tx [description]
*/
ve.ui.CodeMirrorAction.prototype.onDocumentPrecommit = function ( tx ) {
var offset = 0,
var i,
offset = 0,
replacements = [],
linearData = this.surface.getModel().getDocument().data,
store = linearData.getStore(),
@ -196,9 +197,6 @@ ve.ui.CodeMirrorAction.prototype.onDocumentPrecommit = function ( tx ) {
}
} );
// Defer to allow to VE surface to update rendering to correct size (T185184)
setTimeout( function () {
var i;
// Apply replacements in reverse to avoid having to shift offsets
for ( i = replacements.length - 1; i >= 0; i-- ) {
mirror.replaceRange(
@ -207,7 +205,13 @@ ve.ui.CodeMirrorAction.prototype.onDocumentPrecommit = function ( tx ) {
replacements[ i ].end
);
}
} );
// HACK: The absolutely positioned CodeMirror doesn't calculate the viewport
// correctly when expanding from less than the viewport height. (T185184)
if ( mirror.display.sizer.style.minHeight !== this.lastHeight ) {
mirror.refresh();
}
this.lastHeight = mirror.display.sizer.style.minHeight;
};
/* Registration */