mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer
synced 2024-09-29 13:17:35 +00:00
Merge "Replace deprecated jQuery.browser with jQuery.client"
This commit is contained in:
commit
9bbb293d00
|
@ -261,24 +261,28 @@ $wgResourceModules += array(
|
||||||
),
|
),
|
||||||
|
|
||||||
'mmv.routing' => $wgMediaViewerResourceTemplate + array(
|
'mmv.routing' => $wgMediaViewerResourceTemplate + array(
|
||||||
'scripts' => array(
|
'scripts' => array(
|
||||||
'mmv/routing/mmv.routing.js',
|
'mmv/routing/mmv.routing.js',
|
||||||
'mmv/routing/mmv.routing.Route.js',
|
'mmv/routing/mmv.routing.Route.js',
|
||||||
'mmv/routing/mmv.routing.ThumbnailRoute.js',
|
'mmv/routing/mmv.routing.ThumbnailRoute.js',
|
||||||
'mmv/routing/mmv.routing.MainFileRoute.js',
|
'mmv/routing/mmv.routing.MainFileRoute.js',
|
||||||
'mmv/routing/mmv.routing.Router.js',
|
'mmv/routing/mmv.routing.Router.js',
|
||||||
),
|
),
|
||||||
|
|
||||||
'dependencies' => array(
|
'dependencies' => array(
|
||||||
'mediawiki.Title',
|
'mediawiki.Title',
|
||||||
'oojs',
|
'oojs',
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
||||||
'mmv.base' => $wgMediaViewerResourceTemplate + array(
|
'mmv.base' => $wgMediaViewerResourceTemplate + array(
|
||||||
'scripts' => array(
|
'scripts' => array(
|
||||||
'mmv/mmv.base.js',
|
'mmv/mmv.base.js',
|
||||||
),
|
),
|
||||||
|
|
||||||
|
'dependencies' => array(
|
||||||
|
'jquery.client',
|
||||||
|
),
|
||||||
),
|
),
|
||||||
|
|
||||||
'mmv.ui' => $wgMediaViewerResourceTemplate + array(
|
'mmv.ui' => $wgMediaViewerResourceTemplate + array(
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
// We have to disable support for IE < 9 until this is fixed: https://bugzilla.wikimedia.org/show_bug.cgi?id=63303
|
// We have to disable support for IE < 9 until this is fixed: https://bugzilla.wikimedia.org/show_bug.cgi?id=63303
|
||||||
// This can't be done with feature detection, as the error IE triggers in that situation can't be caught
|
// This can't be done with feature detection, as the error IE triggers in that situation can't be caught
|
||||||
isBrowserSupported : function () {
|
isBrowserSupported : function () {
|
||||||
return ! ( $.browser.msie && parseFloat( $.browser.version ) < 9 );
|
var profile = $.client.profile();
|
||||||
|
return ! ( profile.name === 'msie' && profile.versionNumber < 9 );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}( mediaWiki, jQuery ) );
|
}( mediaWiki, jQuery ) );
|
||||||
|
|
Loading…
Reference in a new issue