From: umherirrender <umherirrender_de.wp@web.de>
Date: Sun, 15 Jun 2014 09:53:31 +0000 (+0200)
Subject: Migrate 'wgBreakFrames' from wikibits.js to mediawiki.page.ready
X-Git-Tag: 1.31.0-rc.0~14889^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=f7c324685195;p=lhc%2Fweb%2Fwiklou.git

Migrate 'wgBreakFrames' from wikibits.js to mediawiki.page.ready

This module now contains the same code as in wikibits.js.

For cached entries the new code works automatically since both
legacy wikibits and mediawiki.page.ready are already present in
the load() queue of existing pages.

Change-Id: I18b068fbcf4ba0646fb07313c3d9676cc76a0ad5
---

diff --git a/resources/src/mediawiki.page/mediawiki.page.ready.js b/resources/src/mediawiki.page/mediawiki.page.ready.js
index ccddb3e152..a05a054c76 100644
--- a/resources/src/mediawiki.page/mediawiki.page.ready.js
+++ b/resources/src/mediawiki.page/mediawiki.page.ready.js
@@ -1,6 +1,16 @@
 ( function ( mw, $ ) {
 	var supportsPlaceholder = 'placeholder' in document.createElement( 'input' );
 
+	// Break out of framesets
+	if ( mw.config.get( 'wgBreakFrames' ) ) {
+		// Note: In IE < 9 strict comparison to window is non-standard (the standard didn't exist yet)
+		// it works only comparing to window.self or window.window (http://stackoverflow.com/q/4850978/319266)
+		if ( window.top !== window.self ) {
+			// Un-trap us from framesets
+			window.top.location = window.location;
+		}
+	}
+
 	mw.hook( 'wikipage.content' ).add( function ( $content ) {
 		var $sortableTables;
 
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index fdfca0afe3..b6689f9114 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -8,15 +8,6 @@
 		isIE6 = ( /msie ([0-9]{1,}[\.0-9]{0,})/.exec( ua ) && parseFloat( RegExp.$1 ) <= 6.0 ),
 		onloadFuncts = [];
 
-if ( mw.config.get( 'wgBreakFrames' ) ) {
-	// Note: In IE < 9 strict comparison to window is non-standard (the standard didn't exist yet)
-	// it works only comparing to window.self or window.window (http://stackoverflow.com/q/4850978/319266)
-	if ( win.top !== win.self ) {
-		// Un-trap us from framesets
-		win.top.location = win.location;
-	}
-}
-
 /**
  * User-agent sniffing.
  *