Fixes deprecation warnings (#13)

jdlrobson · web-flow · commit 439bc6549417 · 2022-06-02T20:46:56.000+03:00
* Fixes deprecation warnings

- Module mediawiki.skinning.content.externallinks is removed in 1.39
- Adds version requirement
- Removes output of head tag in 1.39
diff --git a/includes/Skin2018Template.php b/includes/Skin2018Template.php
@@ -20,13 +20,20 @@ public function execute() {
 		}
 
 		// Output <head>
-		echo $this->get( 'headelement' );
+		$pre139 = version_compare( MW_VERSION, '1.39', '<' );
+		if ( $pre139 ) {
+			echo $this->get( 'headelement' );
+		}
 
 		// Output <body> using Mustache
 		$templateParser = new TemplateParser( __DIR__ . '/../resources/templates' );
 
 		echo $templateParser->processTemplate(
 			'main', $this->data
 		);
+		if ( $pre139 ) {
+			echo '</body></html>';
+		}
+
 	}
 }
diff --git a/resources/templates/main.mustache b/resources/templates/main.mustache
@@ -1,4 +1,4 @@
-<body>
+<!-- start -->
     {{! TODO: Replace UIkit with something that's more CSS and less JS, for better default usability https://github.com/troxler/awesome-css-frameworks }}
     {{! TODO: Better mermaid integration to remove need for <pre> tags }}
     {{! TODO: Better image handling to prevent overrun }}
@@ -132,4 +132,4 @@
             </div>
         </footer>
     </div>
-</body>
+<!-- end -->
diff --git a/skin.json b/skin.json
@@ -14,8 +14,8 @@
                 {
                     "name": "2018",
                     "responsive": true,
+                    "bodyOnly": true,
                     "styles": [
-                        "mediawiki.skinning.content.externallinks",
                         "skins.2018"
                     ],
                     "scripts": [
@@ -33,6 +33,10 @@
     "ResourceModules": {
         "skins.2018": {
             "class": "ResourceLoaderSkinModule",
+            "features": {
+                "content-links": true,
+                "content-links-external": true
+            },
             "styles": {
                 "resources/less/styles.less": {
                     "media": "screen"

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,20 @@ public function execute() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// Output <head>`
`23`		`- echo $this->get( 'headelement' );`
	`23`	`+ $pre139 = version_compare( MW_VERSION, '1.39', '<' );`
	`24`	`+ if ( $pre139 ) {`
	`25`	`+ echo $this->get( 'headelement' );`
	`26`	`+ }`
`24`	`27`
`25`	`28`	`// Output <body> using Mustache`
`26`	`29`	`$templateParser = new TemplateParser( __DIR__ . '/../resources/templates' );`
`27`	`30`
`28`	`31`	`echo $templateParser->processTemplate(`
`29`	`32`	`'main', $this->data`
`30`	`33`	`);`
	`34`	`+ if ( $pre139 ) {`
	`35`	`+ echo '</body></html>';`
	`36`	`+ }`
	`37`	`+`
`31`	`38`	`}`
`32`	`39`	`}`