jenkins-bot has submitted this change and it was merged.
Change subject: Convert to ExtensionRegistration (v 3.1.11)
......................................................................
Convert to ExtensionRegistration (v 3.1.11)
Remove group ext.CodeMirror, too. There is no need to load CodeMirror
in it's own request, it can be loaded with all other modules.
Change-Id: I16958866847b66c523e2edfe841ca20694ec7ccc
---
M CodeMirror.hooks.php
M CodeMirror.php
A extension.json
3 files changed, 92 insertions(+), 85 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index dcd6421..ab74eba 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -19,7 +19,10 @@
* @return bool Always true
*/
public static function onResourceLoaderRegisterModules( ResourceLoader
$rl ) {
- global $wgCodeMirrorResourceTemplate;
+ $codeMirrorResourceTemplate = array(
+ 'localBasePath' => __DIR__ . '/resources',
+ 'remoteExtPath' => 'CodeMirror/resources',
+ );
self::$extModes = array(
'tag' => array(
@@ -53,7 +56,7 @@
'messages' => array_keys( $extResources['messages'] ),
'dependencies' => array_keys(
$extResources['dependencies'] ),
'group' => 'ext.CodeMirror',
- ) + $wgCodeMirrorResourceTemplate;
+ ) + $codeMirrorResourceTemplate;
$rl->register( array( 'ext.CodeMirror.other' => $codeMirror ) );
diff --git a/CodeMirror.php b/CodeMirror.php
index 6cc452a..568907d 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -1,85 +1,13 @@
<?php
-/**
- * Main entry point for the CodeMirror extension.
- *
- * @link https://www.mediawiki.org/wiki/Extension:CodeMirror Documentation
- * @file CodeMirror.php
- * @defgroup CodeMirror
- * @ingroup Extensions
- * @author Pavel Astakhov <[email protected]>
- * @licence GNU General Public Licence 2.0 or later
- */
-
-// Check to see if we are being called as an extension or directly
-if ( !defined( 'MEDIAWIKI' ) ) {
- die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
+if ( function_exists( 'wfLoadExtension' ) ) {
+ wfLoadExtension( 'CodeMirror' );
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['CodeMirror'] = __DIR__ . '/i18n';
+ /* wfWarn(
+ 'Deprecated PHP entry point used for CodeMirror extension.
Please use wfLoadExtension instead, ' .
+ 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return true;
+} else {
+ die( 'This version of the CodeMirror extension requires MediaWiki
1.25+' );
}
-
-const EXT_CODEMIRROR_VERSION = '3.1.10';
-
-// Register this extension on Special:Version
-$wgExtensionCredits['parserhook'][] = array(
- 'path' => __FILE__,
- 'name' => 'CodeMirror',
- 'version' => EXT_CODEMIRROR_VERSION,
- 'url' => 'https://www.mediawiki.org/wiki/Extension:CodeMirror',
- 'author' => array( '[https://www.mediawiki.org/wiki/User:Pastakhov
Pavel Astakhov]', 'Florian Schmidt' ),
- 'descriptionmsg' => 'codemirror-desc'
-);
-
-// Allow translations for this extension
-$wgMessagesDirs['CodeMirror'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['CodeMirror'] = __DIR__ . '/CodeMirror.i18n.php';
-
-$wgAutoloadClasses['CodeMirrorHooks'] = __DIR__ . '/CodeMirror.hooks.php';
-
-$wgHooks['MakeGlobalVariablesScript'][] =
'CodeMirrorHooks::onMakeGlobalVariablesScript';
-$wgHooks['BeforePageDisplay'][] = 'CodeMirrorHooks::onBeforePageDisplay';
-$wgHooks['GetPreferences'][] = 'CodeMirrorHooks::onGetPreferences';
-$wgHooks['ResourceLoaderRegisterModules'][] =
'CodeMirrorHooks::onResourceLoaderRegisterModules';
-
-$wgCodeMirrorResourceTemplate = array(
- 'localBasePath' => __DIR__ . '/resources',
- 'remoteExtPath' => 'CodeMirror/resources',
-);
-
-$wgResourceModules['ext.CodeMirror.init'] = $wgCodeMirrorResourceTemplate +
array(
- 'dependencies' => array(
- 'ext.CodeMirror.lib',
- 'ext.CodeMirror.other',
- 'mediawiki.api',
- 'jquery.textSelection',
- 'user.options',
- ),
- 'scripts' => array(
- 'ext.CodeMirror.js'
- ),
- 'messages' => array(
- 'codemirror-enable-label',
- 'codemirror-disable-label',
- ),
- 'group' => 'ext.CodeMirror',
-);
-
-$wgResourceModules['ext.CodeMirror.lib'] = $wgCodeMirrorResourceTemplate +
array(
- 'scripts' => array(
- 'lib/codemirror/lib/codemirror.js',
- 'lib/codemirror/addon/selection/active-line.js',
- 'mode/mediawiki/mediawiki.js',
- ),
- 'styles' => array(
- 'lib/codemirror/lib/codemirror.css',
- 'lib/codemirror/addon/lint/lint.css',
- 'mode/mediawiki/mediawiki.css',
- ),
- 'group' => 'ext.CodeMirror',
- 'targets' => array( 'mobile', 'desktop' ),
-);
-
-// Configuration options
-
-/**
- * Specify, if CodeMirror extension should integrate CodeMirror in MediaWiki's
editor (or WikiEditor), or if
- * it should work as a library provider for other extensions.
- */
-$wgCodeMirrorEnableFrontend = true;
diff --git a/extension.json b/extension.json
new file mode 100644
index 0000000..914227d
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,76 @@
+{
+ "name": "CodeMirror",
+ "version": "3.1.11",
+ "author": [
+ "[https://www.mediawiki.org/wiki/User:Pastakhov Pavel
Astakhov]",
+ "[https://www.mediawiki.org/wiki/User:Florianschmidtwelzow
Florian Schmidt]"
+ ],
+ "url": "https://www.mediawiki.org/wiki/Extension:CodeMirror";,
+ "descriptionmsg": "codemirror-desc",
+ "type": "parserhook",
+ "license-name": "GPL-2.0+",
+ "MessagesDirs": {
+ "CodeMirror": [
+ "i18n"
+ ]
+ },
+ "AutoloadClasses": {
+ "CodeMirrorHooks": "CodeMirror.hooks.php"
+ },
+ "ResourceModules": {
+ "ext.CodeMirror.init": {
+ "dependencies": [
+ "ext.CodeMirror.lib",
+ "ext.CodeMirror.other",
+ "mediawiki.api",
+ "jquery.textSelection",
+ "user.options"
+ ],
+ "scripts": [
+ "ext.CodeMirror.js"
+ ],
+ "messages": [
+ "codemirror-enable-label",
+ "codemirror-disable-label"
+ ]
+ },
+ "ext.CodeMirror.lib": {
+ "scripts": [
+ "lib/codemirror/lib/codemirror.js",
+ "lib/codemirror/addon/selection/active-line.js",
+ "mode/mediawiki/mediawiki.js"
+ ],
+ "styles": [
+ "lib/codemirror/lib/codemirror.css",
+ "lib/codemirror/addon/lint/lint.css",
+ "mode/mediawiki/mediawiki.css"
+ ],
+ "targets": [
+ "mobile",
+ "desktop"
+ ]
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "resources",
+ "remoteExtPath": "CodeMirror/resources"
+ },
+ "Hooks": {
+ "MakeGlobalVariablesScript": [
+ "CodeMirrorHooks::onMakeGlobalVariablesScript"
+ ],
+ "BeforePageDisplay": [
+ "CodeMirrorHooks::onBeforePageDisplay"
+ ],
+ "GetPreferences": [
+ "CodeMirrorHooks::onGetPreferences"
+ ],
+ "ResourceLoaderRegisterModules": [
+ "CodeMirrorHooks::onResourceLoaderRegisterModules"
+ ]
+ },
+ "config": {
+ "CodeMirrorEnableFrontend": true
+ },
+ "manifest_version": 1
+}
--
To view, visit https://gerrit.wikimedia.org/r/230570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16958866847b66c523e2edfe841ca20694ec7ccc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Pastakhov <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
