From 8eb99c94a9356530e82e43684c6d45fd3115e35d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Thu, 23 Apr 2015 08:55:25 +0200 Subject: [PATCH] wikibits: Un-deprecate importScript and importStylesheet Per discussion on T95964. No suitable replacement exists yet. importScriptURI and importStylesheetURI stay deprecated, having been superseded by mw.loader.load. Follow-up to 5c5e09016d6b9b2d3d4799a9a34344a8cc96726f. Bug: T95964 Change-Id: I2d734ca57e991be88472ae76a66f9547f6da82c8 --- RELEASE-NOTES-1.25 | 5 +++-- resources/src/mediawiki.legacy/wikibits.js | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index e74474d0ef..9d8487cb55 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -491,8 +491,9 @@ changes to languages because of Bugzilla reports. RewriteBase / RewriteRule ^(.*)\.php5 $1.php [R=301,L] -* The global importScript and importStylesheet functions, as well as the loadedScripts object, - from wikibits.js (deprecated since 1.17) now emit warnings through mw.log.warn when accessed. +* The global importScriptURI and importStylesheetURI functions, as well as the + loadedScripts object, from wikibits.js (deprecated since 1.17) now emit + warnings through mw.log.warn when accessed. == Compatibility == diff --git a/resources/src/mediawiki.legacy/wikibits.js b/resources/src/mediawiki.legacy/wikibits.js index f5aeb3fe71..32cd79a5ba 100644 --- a/resources/src/mediawiki.legacy/wikibits.js +++ b/resources/src/mediawiki.legacy/wikibits.js @@ -162,8 +162,6 @@ * Wikipage import methods * * See https://www.mediawiki.org/wiki/ResourceLoader/Legacy_JavaScript#wikibits.js - * - * @deprecated since 1.17 Use mw.loader instead. Warnings added in 1.26. */ function importScript( page ) { @@ -173,6 +171,9 @@ return importScriptURI( uri ); } + /** + * @deprecated since 1.17 Use mw.loader instead. Warnings added in 1.25. + */ function importScriptURI( url ) { if ( loadedScripts[url] ) { return null; @@ -192,6 +193,9 @@ return importStylesheetURI( uri ); } + /** + * @deprecated since 1.17 Use mw.loader instead. Warnings added in 1.25. + */ function importStylesheetURI( url, media ) { var l = document.createElement( 'link' ); l.rel = 'stylesheet'; @@ -205,9 +209,10 @@ msg = 'Use mw.loader instead.'; mw.log.deprecate( win, 'loadedScripts', loadedScripts, msg ); - mw.log.deprecate( win, 'importScript', importScript, msg ); mw.log.deprecate( win, 'importScriptURI', importScriptURI, msg ); - mw.log.deprecate( win, 'importStylesheet', importStylesheet, msg ); mw.log.deprecate( win, 'importStylesheetURI', importStylesheetURI, msg ); + // Not quite deprecated yet. + win.importScript = importScript; + win.importStylesheet = importStylesheet; }( mediaWiki, jQuery ) ); -- 2.20.1