From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Mon, 28 Jul 2014 19:50:48 +0000 (+0200)
Subject: jquery.textSelection: re-add iframe check due to regression
X-Git-Tag: 1.31.0-rc.0~14707^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=0088dc64beebbd6babb07c1614163764602a4e43;p=lhc%2Fweb%2Fwiklou.git

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
---

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;