apply updates

.eslintrc.json

@@ -0,0 +1,7 @@
+{
+	"root": true,
+	"extends": [
+		"wikimedia/client-es5",
+		"wikimedia/mediawiki"
+	]
+}

.gitignore

@@ -0,0 +1,4 @@
+/node_modules
+/vendor
+/composer.lock
+/.eslintcache

.gitreview

@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/DrawioEditor.git
+track=1
+defaultrebase=0

.phpcs.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<ruleset>
+	<file>.</file>
+	<arg name="extensions" value="php"/>
+	<arg name="encoding" value="UTF-8"/>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="MediaWiki.NamingConventions.ValidGlobalName.allowedPrefix" />
+		<properties>
+			<property name="allowedPrefixes" type="array">
+				<element value="eg" />
+				<element value="wg" />
+			</property>
+		</properties>
+	</rule>
+</ruleset>

DrawioEditor.magic.php

@@ -2,8 +2,6 @@
 
 $magicWords = [];
 
-
 $magicWords['en'] = [
-    'drawio' => [ 0, 'drawio' ],
+	'drawio' => [ 0, 'drawio' ],
 ];
-

Gruntfile.js

@@ -0,0 +1,24 @@
+/* eslint-env node, es6 */
+module.exports = function ( grunt ) {
+	var conf = grunt.file.readJSON( 'extension.json' );
+
+	grunt.loadNpmTasks( 'grunt-banana-checker' );
+	grunt.loadNpmTasks( 'grunt-eslint' );
+
+	grunt.initConfig( {
+		banana: conf.MessagesDirs,
+		eslint: {
+			options: {
+				cache: true
+			},
+			all: [
+				'**/*.json',
+				'!node_modules/**',
+				'!vendor/**'
+			]
+		}
+	} );
+
+	grunt.registerTask( 'test', [ 'eslint', 'banana' ] );
+	grunt.registerTask( 'default', 'test' );
+};

README.md

@@ -4,7 +4,7 @@ This is a MediaWiki extension that integrates the draw.io flow chart editor and
 
 # Warnings
 **Please read these warnings carefully before use**:
-- The actual editor functionality is loaded from draw.io. This code only provides integration.
+- The default editor functionality is loaded from draw.io (for configuration options [see below](#Configuration)). This code only provides integration.
 - Be aware that draw.io is an online service and while this plugin integrates the editor using an iframe and communicates with it only locally in your browser (javascript postMessage), it cannot guarantee that the code loaded from draw.io will not upload any data to foreign servers. **This may be a privacy concern. Read the Privacy section for more information. When in doubt, don't use draw.io or this module. You have been warned!**
 - This plugin is quite new and probably still has bugs, so it may or may not work with your installation.
 
@@ -32,11 +32,18 @@ This is a MediaWiki extension that integrates the draw.io flow chart editor and
 
 2. Activate the plugin in LocalSettings.php:
 
-  ```
-  require_once "$IP/extensions/DrawioEditor/DrawioEditor.php";
+  ```php
+  wfLoadExtension( 'DrawioEditor' );
   ```
 3. If you want so use SVG (recommended) and the version of your MediaWiki is 1.26 or newer, you need to add the namespace ```http://www.w3.org/1999/xhtml``` to ```$validNamespaces```in  ```includes/upload/UploadBase.php```. See Requirements for more information on why this is currently needed.
 
+# Configuration
+
+  ```php
+  $wgDrawioEditorBackendUrl
+  ```
+To avoid the mentioned privacy concerns, you can change the URL of the editor using this setting in LocalSettings.php (i.e. use the officially provided docker image from [jgraph/docker-drawio](https://github.com/jgraph/docker-drawio) as server). The URL given here is used to load the draw.io/diagrams.net editor components embedded in an iframe, **WARNING: changing this URL is officially not supported, but works, only change this for testing purpose or if know what you are doing!** The default value is `https://embed.diagrams.net`.
+
 # Usage
 ## Add a chart
 1. Add the following tag to any wiki page to insert a draw.io chart:

composer.json

@@ -1,8 +1,31 @@
 {
-  "name": "mediawiki/drawio-editor",
-  "type": "mediawiki-extension",
-  "description": "This is a MediaWiki extension that integrates the draw.io flow chart editor and allows inline editing of charts.",
-  "require": {
-    "composer/installers": "~1.0"
-  }
+	"name": "mediawiki/drawio-editor",
+	"type": "mediawiki-extension",
+	"description": "This is a MediaWiki extension that integrates the draw.io flow chart editor and allows inline editing of charts.",
+	"require": {
+		"composer/installers": "~1.0|~2"
+	},
+	"require-dev": {
+		"mediawiki/mediawiki-codesniffer": "41.0.0",
+		"mediawiki/minus-x": "1.1.1",
+		"php-parallel-lint/php-console-highlighter": "1.0.0",
+		"php-parallel-lint/php-parallel-lint": "1.3.2"
+	},
+	"scripts": {
+		"test": [
+			"parallel-lint . --exclude vendor --exclude node_modules",
+			"minus-x check .",
+			"@phpcs"
+		],
+		"fix": [
+			"minus-x fix .",
+			"phpcbf"
+		],
+		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"composer/installers": true
+		}
+	}
 }

extension.json

@@ -1,25 +1,79 @@
 {
 	"name": "DrawioEditor",
 	"license-name": "GPL-3.0-only",
-	"version": "1.0",
+	"version": "2.0.0-alpha",
 	"author": [
-		"Markus Gebert"
+		"Markus Gebert",
+		"[https://www.hallowelt.com Hallo Welt! GmbH]"
 	],
-	"description": "draw.io flow chart creation and inline editing",
+	"attributes": {
+		"VisualEditor": {
+			"PluginModules": [
+				"ext.drawioconnector.visualEditor"
+			]
+		},
+		"ContentDroplets": {
+			"Droplets": {
+				"drawio": {
+					"class": "\\MediaWiki\\Extension\\DrawioEditor\\ContentDroplets\\DrawioDroplet"
+				}
+			}
+		}
+	},
+	"descriptionmsg": "drawioeditor-desc",
 	"type": "parserhook",
+	"requires": {
+		"MediaWiki": ">= 1.35.0"
+	},
 	"ExtensionMessagesFiles": {
 		"DrawioEditorMagic": "DrawioEditor.magic.php"
 	},
+	"MessagesDirs": {
+		"DrawioEditor": [
+			"i18n"
+		]
+	},
 	"AutoloadNamespaces": {
 		"MediaWiki\\Extension\\DrawioEditor\\": "src/"
 	},
 	"ResourceModules": {
+		"ext.drawioeditor.styles": {
+			"styles": "ext.drawioeditor.css"
+		},
 		"ext.drawioeditor": {
 			"scripts": "ext.drawioeditor.js",
-			"styles": "ext.drawioeditor.css",
 			"dependencies": [
-			 	"jquery.ui",
-			 	"mediawiki.api"
+				"jquery.ui",
+				"mediawiki.api"
+			],
+			"messages": [
+				"drawioeditor-approved-editwarning",
+				"drawioeditor-approved-displaywarning",
+				"drawioeditor-noapproved",
+				"drawioeditor-approve-link",
+				"drawioeditor-changeapprove-link"
+			]
+		},
+		"ext.drawioconnector.visualEditor": {
+			"scripts": [
+				"ve/ve.dm.DrawioNode.js",
+				"ve/ve.ce.DrawioNode.js",
+				"ve/ve.ui.DrawioInspector.js",
+				"ve/ve.ui.DrawioNodeTool.js"
+			],
+			"styles": [
+				"ext.drawio.droplet.css"
+			],
+			"dependencies": [
+				"ext.visualEditor.mwcore",
+				"oojs-ui"
+			],
+			"messages": [
+				"drawioconnector-ve-drawio-title",
+				"drawioconnector-ve-drawio-tag-name",
+				"drawio-usage",
+				"drawio-droplet-name",
+				"drawio-droplet-description"
 			]
 		}
 	},
@@ -28,17 +82,36 @@
 		"remoteExtPath": "DrawioEditor/resources"
 	},
 	"Hooks": {
-		"OutputPageParserOutput": "MediaWiki\\Extension\\DrawioEditor\\Hook\\OutputPageParserOutput\\AddModules::callback",
-		"ParserFirstCallInit": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback"
+		"ParserFirstCallInit": [
+			"tag",
+			"MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback"
+		],
+		"DrawioGetFile": "approveRevsSetStableFile",
+		"BSInsertMagicAjaxGetData": [
+			"\\MediaWiki\\Extension\\DrawioEditor\\Hook\\BSInsertMagicAjaxGetData\\AddDrawioTag::callback"
+		],
+		"BSUEModulePDFFindFiles": "\\MediaWiki\\Extension\\DrawioEditor\\Hooks::onBSUEModulePDFFindFiles",
+		"ImagePageAfterImageLinks": "\\MediaWiki\\Extension\\DrawioEditor\\Hooks::onImagePageAfterImageLinks"
+	},
+	"HookHandlers": {
+		"tag": {
+			"class": "\\MediaWiki\\Extension\\DrawioEditor\\Hook\\Tag"
+		},
+		"approveRevsSetStableFile": {
+			"class": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ApprovedRevsSetStableFile",
+			"services": [ "DBLoadBalancer", "RepoGroup" ]
+		}
 	},
 	"config": {
 		"DrawioEditorImageType": {
 			"value": "svg"
 		},
 		"DrawioEditorImageInteractive": {
 			"value": false
+		},
+		"DrawioEditorBackendUrl": {
+			"value": "https://embed.diagrams.net"
 		}
 	},
-	"load_composer_autoloader" : true,
 	"manifest_version": 2
 }

i18n/ar.json

@@ -0,0 +1,13 @@
+{
+	"@metadata": {
+		"authors": [
+			"Meno25"
+		]
+	},
+	"drawioeditor-desc": "رسم مخطط تدفق الرسم والتحرير المضمن",
+	"drawioeditor-approved-editwarning": "يرجى ملاحظة أنك تقوم الآن بتحرير أحدث مراجعة لهذا الرسم التخطيطي ، وهي ليست النسخة المعتمدة المعروضة بشكل افتراضي.",
+	"drawioeditor-approved-displaywarning": "هذه هي المراجعة المعتمدة للرسم التخطيطي وليست المراجعة الأخيرة.",
+	"drawioeditor-noapproved": "الرسم التخطيطي $1 ليس له مراجعة معتمدة.",
+	"drawioeditor-approve-link": "انقر هنا للموافقة على المراجعة",
+	"drawioeditor-changeapprove-link": "انقر هنا لتغيير المراجعة المعتمدة لهذا الرسم التخطيطي"
+}

i18n/bn.json

@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"আফতাবুজ্জামান"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "নাম"
+}

i18n/ckb.json

@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Aram"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "ناو"
+}

i18n/de.json

@@ -0,0 +1,13 @@
+{
+	"@metadata": {
+		"authors": []
+	},
+	"drawioeditor-desc": "draw.io Flussdiagramm-Erstellung und Inline-Bearbeitung",
+	"drawioeditor-approved-editwarning": "Bitte beachte, dass du jetzt die letzte Version dieses Diagramms bearbeitest, die nicht die standardmäßig angezeigte genehmigte Version ist.",
+	"drawioeditor-approved-displaywarning": "Dies ist die genehmigte Version des Diagramms und nicht die letzte Version.",
+	"drawioeditor-noapproved": "Das Diagramm $1 hat keine genehmigte Version.",
+	"drawioeditor-approve-link": "Klicke hier, um eine Version zu genehmigen",
+	"drawioeditor-changeapprove-link": "Klicke hier, um die genehmigte Version für dieses Diagramm zu ändern",
+	"drawio-droplet-name": "Diagramm",
+	"drawio-droplet-description": "Bearbeitbares draw.io-Diagramm"
+}

i18n/en.json

@@ -0,0 +1,21 @@
+{
+	"@metadata": {},
+	"drawioeditor-desc": "draw.io flow chart creation and inline editing",
+	"drawioeditor-approved-editwarning": "Please note that you are now editing the latest revision of this diagram, which is not the approved one shown by default.",
+	"drawioeditor-approved-displaywarning": "This is the approved revision of the diagram and not the latest revision.",
+	"drawioeditor-noapproved": "The diagram $1 has no approved revision.",
+	"drawioeditor-approve-link": "Click here to approve a revision",
+	"drawioeditor-changeapprove-link": "Click here to change the approved revision for this diagram",
+
+	"drawio-usage": "Used with Drawio tag",
+	"drawio-not-used": "There are no pages with this Drawio image",
+	"drawioconnector-extension-description": "Connects BlueSpice to Drawio",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Draw.io diagram",
+	"drawioconnector-tag-drawio-desc": "Insert a draw.io diagram that can be edited.",
+	"drawioconnector-ve-drawio-tag-name": "Name",
+	"drawioconnector-ve-drawio-tag-name-help": "Name of the diagram as stored in the wiki",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1",
+	"drawio-droplet-name": "Diagram",
+	"drawio-droplet-description": "Editable draw.io diagram"
+}

i18n/es.json

@@ -0,0 +1,18 @@
+{
+	"@metadata": {
+		"authors": [
+			"DiegoAmbrocio",
+			"Fitoschido"
+		]
+	},
+	"drawioeditor-desc": "Creación de diagramas de flujo en draw.io y edición en línea",
+	"drawioeditor-approved-editwarning": "Tenga en cuenta que ahora está editando la última revisión de este diagrama, que no es la aprobada que se muestra por defecto.",
+	"drawioeditor-approved-displaywarning": "Esta es la revisión aprobada del diagrama y no la última revisión.",
+	"drawioeditor-noapproved": "El diagrama $1 no tiene ninguna revisión aprobada.",
+	"drawioeditor-approve-link": "Haga clic aquí para aprobar una revisión",
+	"drawioeditor-changeapprove-link": "Haga clic aquí para cambiar la revisión aprobada para este diagrama",
+	"drawio-not-used": "No existe ninguna página en esta imagen de Drawio",
+	"drawioconnector-extension-description": "Conecta BlueSpice con Drawio",
+	"drawioconnector-ve-drawio-title": "Diagrama de Draw.io",
+	"drawioconnector-ve-drawio-tag-name": "Nombre"
+}

i18n/fi.json

@@ -0,0 +1,11 @@
+{
+	"@metadata": {
+		"authors": [
+			"Nike"
+		]
+	},
+	"drawio-usage": "Käytetty Drawio-elementin kanssa",
+	"drawioconnector-extension-description": "Yhdistää BlueSpicen Drawioon",
+	"drawioconnector-ve-drawio-title": "Draw.io-kaavio",
+	"drawioconnector-ve-drawio-tag-name": "Nimi"
+}

i18n/fr.json

@@ -0,0 +1,27 @@
+{
+	"@metadata": {
+		"authors": [
+			"Gomoko",
+			"GrandEscogriffe",
+			"Thibaut120094",
+			"Verdy p"
+		]
+	},
+	"drawioeditor-desc": "Création et modification en ligne de diagrammes de flux pour draw.io",
+	"drawioeditor-approved-editwarning": "Veuillez noter que vous modifiez actuellement la dernière version de ce diagramme, qui n’est pas celle qui est approuvée et affichée par défaut.",
+	"drawioeditor-approved-displaywarning": "Ceci est la version approuvée du diagramme mais pas la dernière version.",
+	"drawioeditor-noapproved": "Le diagramme $1 n’a pas de version approuvée.",
+	"drawioeditor-approve-link": "Cliquez ici pour approuver une version",
+	"drawioeditor-changeapprove-link": "Cliquer ici pour modifier la version approuvée de ce diagramme",
+	"drawio-usage": "Utilisé avec la balise Drawio",
+	"drawio-not-used": "Il n’y a aucune page avec cette image Drawio.",
+	"drawioconnector-extension-description": "Connecte BlueSpice à Drawio.",
+	"drawioconnector-tag-drawio-title": "Draw.io",
+	"drawioconnector-ve-drawio-title": "Diagramme Draw.io",
+	"drawioconnector-tag-drawio-desc": "Insérer un diagramme Draw.io qui peut être modifié.",
+	"drawioconnector-ve-drawio-tag-name": "Nom",
+	"drawioconnector-ve-drawio-tag-name-help": "Nom du diagramme tel qu’il est stocké dans le wiki",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramme-1",
+	"drawio-droplet-name": "Diagramme",
+	"drawio-droplet-description": "Diagramme draw.io modifiable"
+}