Move declarations from datamaps.mjs to their logical places.

Author: KockaAdmiralac

extensions/datamaps.mjs

@@ -273,14 +273,14 @@ function generateWrite(multiple) {
     };
 }
 
-export const DATAMAPS_SINGLE /** @type {ScriptedMapFormat} */ = {
-    extension: 'mw-datamaps',
-    name: 'DataMaps (single wiki)',
-    write: generateWrite(false)
-};
-
-export const DATAMAPS_MULTIPLE /** @type {ScriptedMapFormat} */ = {
+tiled.registerMapFormat('dataMaps', {
     extension: 'mw-datamaps',
     name: 'DataMaps (all wikis)',
     write: generateWrite(true)
-};
+});
+
+tiled.registerMapFormat('dataMap', {
+    extension: 'mw-datamaps',
+    name: 'DataMaps (single wiki)',
+    write: generateWrite(false)
+});

extensions/includes/format.mjs

@@ -179,38 +179,53 @@ const /** @type {Record<MapObjectShape, MarkerPopupHandler|undefined>} */ handle
     [MapObject.Text]: undefined,
 };
 
-/**
- * Called when the currently selected objects on the map change.
- * @param {MapObject[]} objects Currently selected map objects
- */
-export default function selectedObjectsChanged(objects) {
-    if (objects.length !== 1) {
-        return;
+const enablePopup = tiled.registerAction('WikiMarkerPopup', () => {});
+enablePopup.checkable = true;
+enablePopup.checked = true;
+enablePopup.iconVisibleInMenu = false;
+enablePopup.text = 'Enable marker popup';
+enablePopup.shortcut = 'Ctrl+Shift+M';
+
+tiled.extendMenu('Edit', [
+    {
+        action: 'WikiMarkerPopup'
     }
-    const object = objects[0];
-    const handlerFunc = handlers[object.shape];
-    tiled.log(JSON.stringify(handlerFunc));
-    if (typeof handlerFunc !== 'function') {
-        tiled.alert('This object cannot be converted to DataMaps on the wiki!');
+]);
+
+tiled.assetOpened.connect(asset => {
+    if (!asset.isTileMap) {
         return;
     }
-    const dialog = new Dialog('Editing map marker');
-    dialog.minimumWidth = 600;
-    const languageNames = getLanguageNames();
-    const languageSelect = dialog.addComboBox('Wiki language:', languageNames);
-    languageSelect.visible = languageNames.length > 1;
-    dialog.addNewRow();
-    const handler = handlerFunc(object, dialog);
-    languageSelect.currentIndexChanged.connect(index => {
-        handler.updateLanguage(selectLanguage(index));
-    });
-    dialog.addButton('OK').clicked.connect(() => {
-        handler.performChanges(selectLanguage(languageSelect.currentIndex));
-        dialog.done(Dialog.Accepted);
+    const tileMap = /** @type {TileMap} */ (asset);
+    tileMap.selectedObjectsChanged.connect(() => {
+        if (!enablePopup.checked || tileMap.selectedObjects.length !== 1) {
+            return;
+        }
+        const object = tileMap.selectedObjects[0];
+        const handlerFunc = handlers[object.shape];
+        tiled.log(JSON.stringify(handlerFunc));
+        if (typeof handlerFunc !== 'function') {
+            tiled.alert('This object cannot be converted to DataMaps on the wiki!');
+            return;
+        }
+        const dialog = new Dialog('Editing map marker');
+        dialog.minimumWidth = 600;
+        const languageNames = getLanguageNames();
+        const languageSelect = dialog.addComboBox('Wiki language:', languageNames);
+        languageSelect.visible = languageNames.length > 1;
+        dialog.addNewRow();
+        const handler = handlerFunc(object, dialog);
+        languageSelect.currentIndexChanged.connect(index => {
+            handler.updateLanguage(selectLanguage(index));
+        });
+        dialog.addButton('OK').clicked.connect(() => {
+            handler.performChanges(selectLanguage(languageSelect.currentIndex));
+            dialog.done(Dialog.Accepted);
+        });
+        dialog.addButton('Cancel').clicked.connect(() => {
+            dialog.done(Dialog.Rejected);
+        });
+        handler.updateLanguage(selectLanguage(languageSelect.currentIndex));
+        dialog.show();
     });
-    dialog.addButton('Cancel').clicked.connect(() => {
-        dialog.done(Dialog.Rejected);
-    });
-    handler.updateLanguage(selectLanguage(languageSelect.currentIndex));
-    dialog.show();
-}
+});

extensions/includes/popup.mjs

@@ -189,10 +189,7 @@ function handlePublishError(error) {
     tiled.log(`Error details: ${error.message || error}`);
 }
 
-/**
- * Publishes the current map to the wiki.
- */
-export default function run() {
+const publishAction = tiled.registerAction('PublishToWiki', () => {
     if (!tiled.activeAsset || !tiled.activeAsset.isTileMap) {
         tiled.alert('Please open the map you want to publish first.');
         return;
@@ -205,4 +202,13 @@ export default function run() {
             addToPromise(publishMap(token, summary, map, language), language))
         .then(([response, language]) => handlePublishSuccess(response, language))
         .catch(handlePublishError);
-}
+});
+publishAction.text = 'Publish to wiki';
+publishAction.icon = 'wiki.svg';
+publishAction.shortcut = 'Ctrl+Shift+U';
+
+tiled.extendMenu('File', [
+    {
+        action: 'PublishToWiki'
+    }
+]);