jenkins-bot has submitted this change and it was merged.
Change subject: jquery.textSelection: re-add iframe check due to regression
......................................................................
jquery.textSelection: re-add iframe check due to regression
This is to fix a regression due to change Ibe011b2b of bug 29328.
The replacement jquery.textSelection of CodeEditor was no longer able
to be disable don the fly. This is because the code of textSelection
and WikiEditor is still too much intertwined.
I'm making a new patchset to strip them further apart.
Bug: 68556
Change-Id: I7c4c43ba2cde6f7c869e41ed4c5a51783cd32f82
---
M resources/src/jquery/jquery.textSelection.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/jquery/jquery.textSelection.js
b/resources/src/jquery/jquery.textSelection.js
index e5444eb..289cd22 100644
--- a/resources/src/jquery/jquery.textSelection.js
+++ b/resources/src/jquery/jquery.textSelection.js
@@ -553,7 +553,7 @@
}
context = $( this ).data( 'wikiEditor-context' );
- hasWikiEditorSurface = ( context !== undefined );
+ hasWikiEditorSurface = ( context !== undefined &&
context.$iframe !== undefined );
// IE selection restore voodoo
needSave = false;
--
To view, visit https://gerrit.wikimedia.org/r/150009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c4c43ba2cde6f7c869e41ed4c5a51783cd32f82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
