Merge "Remove jQuery.jStorage shim"

This commit is contained in:
jenkins-bot 2016-08-16 23:00:27 +00:00 committed by Gerrit Code Review
commit 193b8dd9f3

View file

@ -171,26 +171,7 @@
} }
$( function () { $( function () {
var jStorage = mw.storage.get( 'jStorage' ); if ( mw.popups.enabled ) {
// FIXME: Can be removed a month from jStorage removal. Not perfect but should work in most cases.
if ( jStorage && jStorage.indexOf( 'popups-enabled' ) > 0 ) {
// slower loading popups when in transition mode
mw.loader.using( 'jquery.jStorage' ).done( function () {
var val = $.jStorage.get( 'mwe-popups-enabled' );
// delete jStorage key
$.jStorage.deleteKey( 'mwe-popups-enabled' );
if ( val === 'false' ) {
// copy over
mw.storage.set( 'mwe-popups-enabled', '0' );
} else {
if ( val ) {
mw.storage.set( 'mwe-popups-enabled', '1' );
}
initPopups();
}
} );
} else if ( mw.popups.enabled ) {
initPopups(); initPopups();
} }