From 0088dc64beebbd6babb07c1614163764602a4e43 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Mon, 28 Jul 2014 21:50:48 +0200 Subject: [PATCH] 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 --- resources/src/jquery/jquery.textSelection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/src/jquery/jquery.textSelection.js b/resources/src/jquery/jquery.textSelection.js index e5444ebfd6..289cd22086 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; -- 2.20.1