Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
jenkins-bot 2014-07-18 16:24:44 +00:00 committed by Gerrit Code Review
commit f3cace56e7
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/src/mediawiki.page/mediawiki.page.ready.js
View file

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

9
skins/common/wikibits.js
View file

@ -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.
*