diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-05 15:30:48 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-05 15:30:48 -0400 |
commit | 3d86add3dfa5e0b3ead9859593d4a52cf7555a34 (patch) | |
tree | 453d8bd3fda4dbb3020017ea1a469291da5cdc71 /resources/mediawiki/mediawiki.js | |
parent | 064cec79ca4c8201de0d06bbca6cb7a5345d11be (diff) | |
parent | 2e44b49a2db3026050b136de9b00f749dd3ff939 (diff) |
Merge branch 'archwiki'
Diffstat (limited to 'resources/mediawiki/mediawiki.js')
-rw-r--r-- | resources/mediawiki/mediawiki.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index 80223e5d..5a4ff1b5 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -21,6 +21,7 @@ var mw = ( function ( $, undefined ) { * fine. No need for optimization here, which would only result in losing logs. * * @private + * @method log_ * @param {string} msg text for the log entry. * @param {Error} [e] */ @@ -318,6 +319,9 @@ var mw = ( function ( $, undefined ) { } }; + /** + * @class mw + */ return { /* Public Members */ @@ -1446,16 +1450,19 @@ var mw = ( function ( $, undefined ) { * @param {Function|Array} script Function with module code or Array of URLs to * be used as the src attribute of a new `<script>` tag. * @param {Object} style Should follow one of the following patterns: + * * { "css": [css, ..] } * { "url": { <media>: [url, ..] } } + * * And for backwards compatibility (needs to be supported forever due to caching): + * * { <media>: css } * { <media>: [url, ..] } * * The reason css strings are not concatenated anymore is bug 31676. We now check * whether it's safe to extend the stylesheet (see #canExpandStylesheetWith). * - * @param {Object} msgs List of key/value pairs to be added to {@link mw#messages}. + * @param {Object} msgs List of key/value pairs to be added to mw#messages. */ implement: function ( module, script, style, msgs ) { // Validate input |