[TikiWiki-commits] [Git][tikiwiki/tiki][master] [REF] Relocate files inside 'src/js/MOVE_THIS_CONTENT_ELSEWHERE/' to their appropriate places
"Victor Emanouilov \(@kroky\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <69c0fe043a0b7_3b18f7f9023174@gitlab-sidekiq-low-urgency-cpu-bound-v2-6db8dc89bf-6vxm6.mail> |
Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
07b1e81c by Merci Jacob at 2026-03-23T08:39:39+00:00
[REF] Relocate files inside 'src/js/MOVE_THIS_CONTENT_ELSEWHERE/' to their appropriate places
---
* fix ci
* move 'MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-emailFolder.js,tracker-fields-files.js'
* move 'MOVE_THIS_CONTENT_ELSEWHERE/bigbluebutton.js'
* move 'MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-all.dirtyCheck.js'
* move 'MOVE_THIS_CONTENT_ELSEWHERE/pagetabs.js'
* move 'MOVE_THIS_CONTENT_ELSEWHERE/dialog.js'
* move 'MOVE_THIS_CONTENT_ELSEWHERE/cypht.js'
* move 'MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit.js'
* move 'registerFieldDependency' out of 'MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit.js'
* move '/MOVE_THIS_CONTENT_ELSEWHERE/wysiwyg.js'
See merge request tikiwiki/tiki!9811
- - - - -
24 changed files:
- lib/core/Services/Tracker/Controller.php
- lib/core/Tracker/Field/EmailFolder.php
- lib/smarty_tiki/FunctionHandler/InlineAudioPlayer.php
- lib/wiki-plugins/wikiplugin_bigbluebutton.php
- lib/wiki-plugins/wikiplugin_cypht.php
- lib/wiki-plugins/wikiplugin_wysiwyg.php
- path_js_importmap_generator.php
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit/buttons.js → src/js/@tiki/plugin-base/buttonParamHandler.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit/edit.js → src/js/@tiki/plugin-base/registerFieldDependency.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/bigbluebutton.js → src/js/@tiki/plugins/bigbluebutton.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/dialog.js → src/js/@tiki/plugins/dialog.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/pagetabs.js → src/js/@tiki/plugins/pagetabs.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-all.dirtyCheck.js → src/js/@tiki/tracker-field-base/dirtyCheck.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-emailFolder.js → src/js/@tiki/tracker-fields/emailFolder.js
- − src/js/MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/cypht.js → src/js/jquery-tiki/cypht.js
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-files.js → src/js/jquery-tiki/tiki-inline_audio_player.js
- src/js/vite.config.mjs
- src/js/MOVE_THIS_CONTENT_ELSEWHERE/wysiwyg.js → src/js/wysiwyg/plugin.js
- templates/plugin/edit.tpl
- templates/plugin/output/dialog.tpl
- templates/plugin/output/pagetabs.tpl
- templates/plugin/types/buttons.tpl
- tiki-webmail.php
Changes:
=====================================
lib/core/Services/Tracker/Controller.php
=====================================
@@ -1028,7 +1028,7 @@ class Services_Tracker_Controller
TikiLib::lib('header')->add_jq_onready($js);
}
- TikiLib::lib('header')->add_js_module('import "@jquery-tiki/tracker-fields/dirtyCheck";');
+ TikiLib::lib('header')->add_js_module('import "@tiki/tracker-field-base/dirtyCheck";');
$itemId = 0;
$util = new Services_Utilities();
@@ -1304,7 +1304,7 @@ class Services_Tracker_Controller
TikiLib::lib('header')->add_jq_onready($js);
}
- TikiLib::lib('header')->add_js_module('import "@jquery-tiki/tracker-fields/dirtyCheck";');
+ TikiLib::lib('header')->add_js_module('import "@tiki/tracker-field-base/dirtyCheck";');
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$access->preventRedirect(true);
=====================================
lib/core/Tracker/Field/EmailFolder.php
=====================================
@@ -310,7 +310,7 @@ class Tracker_Field_EmailFolder extends Tracker_Field_Files implements \Tracker\
}
$compose_path .= "page=compose&list_path=tracker_folder_" . $this->getItemId() . "_" . $this->getConfiguration('fieldId') . "&list_parent=tracker_" . $this->getTrackerDefinition()->getConfiguration('trackerId');
- TikiLib::lib('header')->add_js_module('import "@jquery-tiki/tracker-fields/emailFolder";');
+ TikiLib::lib('header')->add_js_module('import "@tiki/tracker-fields/emailFolder";');
return $this->renderTemplate('trackeroutput/email_folder.tpl', $context, [
'emails' => $emails,
=====================================
lib/smarty_tiki/FunctionHandler/InlineAudioPlayer.php
=====================================
@@ -13,7 +13,7 @@ class InlineAudioPlayer extends \Smarty\FunctionHandler\Base
{
public function handle($params, \Smarty\Template $template)
{
- TikiLib::lib('header')->add_js_module('import "@jquery-tiki/tracker-fields/files";');
+ TikiLib::lib('header')->add_js_module('import "@jquery-tiki/tiki-inline_audio_player";');
$icon = smarty_function_icon(['name' => 'play'], $template);
$pauseIcon = smarty_function_icon(['name' => 'pause', 'size' => 1], $template);
$stopIcon = smarty_function_icon(['name' => 'xmark', 'size' => 1], $template);
=====================================
lib/wiki-plugins/wikiplugin_bigbluebutton.php
=====================================
@@ -131,7 +131,7 @@ function wikiplugin_bigbluebutton($data, $params)
$smarty->assign('bbb_params', Tiki_Security::get()->encode($params));
$smarty->assign('meetId', $meeting);
if ($prefs['bigbluebutton_use_iframe'] === 'y') {
- $headerlib->add_js_module("import { setupBBBMeetingInIframe } from '@jquery-tiki/plugins/bigbluebutton'; setupBBBMeetingInIframe(" . json_encode($meeting) . ");");
+ $headerlib->add_js_module("import { setupBBBMeetingInIframe } from '@tiki/plugins/bigbluebutton'; setupBBBMeetingInIframe(" . json_encode($meeting) . ");");
}
if (! $bigbluebuttonlib->roomExists($meeting)) {
=====================================
lib/wiki-plugins/wikiplugin_cypht.php
=====================================
@@ -429,7 +429,7 @@ function wikiplugin_cypht($data, $params)
}
}
- $headerlib->add_js_module('import "@jquery-tiki/plugins/cypht";');
+ $headerlib->add_js_module('import "@jquery-tiki/cypht";');
return '<div class="inline-cypht">'
. '<input type="hidden" id="hm_page_key" value="' . Hm_Request_Key::generate() . '" />'
=====================================
lib/wiki-plugins/wikiplugin_wysiwyg.php
=====================================
@@ -104,7 +104,7 @@ function wikiplugin_wysiwyg($data, $params)
['lang' => $lang, 'filePath' => $langFilePath] = TikiLib::lib('wysiwyg')->getEditorLang();
TikiLib::lib('header')->add_js_module(<<<JS
- import('@jquery-tiki/plugins/wysiwyg').then((module) => {
+ import('@wysiwyg/plugin').then((module) => {
module.default('{$exec_key}', JSON.parse('{$tools}'), '{$sourcepage}', {
lang: '{$lang}',
langFilePath: '{$langFilePath}',
=====================================
path_js_importmap_generator.php
=====================================
@@ -25,6 +25,14 @@ function generateJsImportmapScripts(bool $useBaseUrl = false)
// NOTE: Keep the list alphabetically sorted.
//IMPORTANT: All these have to be ESM modules, TEST them, don't assume that they are.
"imports" => [
+ "@tiki/plugin-base/buttonParamHandler" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/plugin-base/buttonParamHandler.js",
+ "@tiki/plugin-base/registerFieldDependency" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/plugin-base/registerFieldDependency.js",
+ "@tiki/plugins/bigbluebutton" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/plugins/bigbluebutton.js",
+ "@tiki/plugins/dialog" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/plugins/dialog.js",
+ "@tiki/plugins/pagetabs" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/plugins/pagetabs.js",
+ "@tiki/tracker-field-base/dirtyCheck" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/tracker-field-base/dirtyCheck.js",
+ "@tiki/tracker-fields/emailFolder" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/tracker-fields/emailFolder.js",
+
/* src/js/@tiki/ui-utils */
"@tiki/ui-utils" => $tikiUrl . JS_ASSETS_PATH . "/@tiki/ui-utils.js",
@@ -104,6 +112,7 @@ function generateJsImportmapScripts(bool $useBaseUrl = false)
/* src/js/jquery_tiki */
"@jquery-tiki/asyncLoop" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-async-loop.js",
"@jquery-tiki/constants" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/constants.js",
+ "@jquery-tiki/cypht" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/cypht.js",
"@jquery-tiki/tiki-calendar" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-calendar.js",
"@jquery-tiki/tiki-cookie-handler" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-cookie-handler.js",
"@jquery-tiki/tiki-editor_settings" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-editor_settings.js",
@@ -112,6 +121,7 @@ function generateJsImportmapScripts(bool $useBaseUrl = false)
"@jquery-tiki/tiki-admin_menu_options" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-admin_menu_options.js",
"@jquery-tiki/tiki-admin_2fa" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-admin_2fa.js",
"@jquery-tiki/tiki-edit_structure" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-edit_structure.js",
+ "@jquery-tiki/tiki-inline_audio_player" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/tiki-inline_audio_player.js",
"@jquery-tiki/wikiplugin-mouseover" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/wikiplugin-mouseover.js",
"@jquery-tiki/wikiplugin-trackercalendar" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/wikiplugin-trackercalendar.js",
"@jquery-tiki/eventcalendar_to_pdf" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/eventcalendar_to_pdf.js",
@@ -122,19 +132,6 @@ function generateJsImportmapScripts(bool $useBaseUrl = false)
"@jquery-tiki/timeago" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/timeago.js",
"@jquery-tiki/validate-alt-image" => $tikiUrl . JS_ASSETS_PATH . "/jquery-tiki/validate-alt-image.js",
- /* src/js/MOVE_THIS_CONTENT_ELSEWHERE
- Note that most of the incorrect @jquery-tiki/ have not been corrected, to minimize immediate impact.
- */
- "@jquery-tiki/plugin-edit" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit.js",
- "@jquery-tiki/plugins/bigbluebutton" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/bigbluebutton.js",
- "@jquery-tiki/plugins/cypht" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/cypht.js",
- "@jquery-tiki/plugins/dialog" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/dialog.js",
- "@jquery-tiki/plugins/pagetabs" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/pagetabs.js",
- "@jquery-tiki/plugins/wysiwyg" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/wysiwyg.js",
- "@jquery-tiki/tracker-fields/emailFolder" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-emailFolder.js",
- "@jquery-tiki/tracker-fields/files" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-files.js",
- "@jquery-tiki/tracker-fields/dirtyCheck" => $tikiUrl . JS_ASSETS_PATH . "/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-all.dirtyCheck.js",
-
/* src/js/tiki-3d-model-viewer */
"@tiki-3d-model-viewer/model3dviewer" => $tikiUrl . JS_ASSETS_PATH . "/tiki-3d-model-viewer.js",
@@ -189,7 +186,8 @@ function generateJsImportmapScripts(bool $useBaseUrl = false)
"@vue-widgets/el-backtop" => $tikiUrl . JS_ASSETS_PATH . "/element-plus-ui/backTop.js",
/* src/js/wysiwyg */
- "@wysiwyg/summernote" => $tikiUrl . JS_ASSETS_PATH . "/wysiwyg-summernote.js",
+ "@wysiwyg/summernote" => $tikiUrl . JS_ASSETS_PATH . "/wysiwyg/summernote.js",
+ "@wysiwyg/plugin" => $tikiUrl . JS_ASSETS_PATH . "/wysiwyg/plugin.js",
]
];
$importmapJson = json_encode($importmap, JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR);
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit/buttons.js → src/js/@tiki/plugin-base/buttonParamHandler.js
=====================================
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit/edit.js → src/js/@tiki/plugin-base/registerFieldDependency.js
=====================================
@@ -1,4 +1,4 @@
-function registerFieldDependency(fieldId, dependencyName, dependencyValue) {
+export default function registerFieldDependency(fieldId, dependencyName, dependencyValue) {
const field = $(`#${fieldId}`);
const fieldContainer = field.closest(".field-container");
const dependency = $(`[name='params[${dependencyName}]']`);
@@ -31,5 +31,3 @@ function registerFieldDependency(fieldId, dependencyName, dependencyValue) {
}
});
}
-
-export { registerFieldDependency };
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/bigbluebutton.js → src/js/@tiki/plugins/bigbluebutton.js
=====================================
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/dialog.js → src/js/@tiki/plugins/dialog.js
=====================================
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/pagetabs.js → src/js/@tiki/plugins/pagetabs.js
=====================================
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-all.dirtyCheck.js → src/js/@tiki/tracker-field-base/dirtyCheck.js
=====================================
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-emailFolder.js → src/js/@tiki/tracker-fields/emailFolder.js
=====================================
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/plugin-edit.js deleted
=====================================
@@ -1,4 +0,0 @@
-// This should not use barrel files in general (interferes with tree shaking). Specifically in vite https://vite.dev/guide/performance#avoid-barrel-files - benoitg - 2026-03-09
-
-export * from "./plugin-edit/buttons.js";
-export * from "./plugin-edit/edit.js";
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/cypht.js → src/js/jquery-tiki/cypht.js
=====================================
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/tracker-fields-files.js → src/js/jquery-tiki/tiki-inline_audio_player.js
=====================================
=====================================
src/js/vite.config.mjs
=====================================
@@ -101,6 +101,10 @@ export default defineConfig(({ command, mode }) => {
{ prefix: "jquery-tiki/", src: "src/js/jquery-tiki" },
{ prefix: "common-reexported/", src: "src/js/common-reexported" },
{ prefix: "MOVE_THIS_CONTENT_ELSEWHERE/", src: "src/js/MOVE_THIS_CONTENT_ELSEWHERE" },
+ { prefix: "@tiki/plugin-base/", src: "src/js/@tiki/plugin-base" },
+ { prefix: "@tiki/plugins/", src: "src/js/@tiki/plugins" },
+ { prefix: "@tiki/tracker-field-base/", src: "src/js/@tiki/tracker-field-base" },
+ { prefix: "@tiki/tracker-fields/", src: "src/js/@tiki/tracker-fields" },
]);
Object.assign(rollupInput, {
@@ -141,7 +145,8 @@ export default defineConfig(({ command, mode }) => {
"tiki-vue-sfc-loader": resolve(__dirname, "tiki-vue-sfc-loader/src/tiki-vue-sfc-loader.js"),
"tiki-toast-ui": resolve(__dirname, "tiki-toast-ui/toast-index.js"),
"@tiki/ui-utils": resolve(__dirname, "@tiki/ui-utils/index.js"),
- "wysiwyg-summernote": resolve(__dirname, "wysiwyg/summernote/index.js"),
+ "wysiwyg/summernote": resolve(__dirname, "wysiwyg/summernote/index.js"),
+ "wysiwyg/plugin": resolve(__dirname, "wysiwyg/plugin.js"),
});
return {
base: "/public/generated/js", //This must NOT have a trailing slash
=====================================
src/js/MOVE_THIS_CONTENT_ELSEWHERE/wysiwyg.js → src/js/wysiwyg/plugin.js
=====================================
=====================================
templates/plugin/edit.tpl
=====================================
@@ -12,7 +12,7 @@
{function registerFieldDependency}
<script type="module">
{literal}
- import {registerFieldDependency} from '@jquery-tiki/plugin-edit';
+ import registerFieldDependency from '@tiki/plugin-base/registerFieldDependency';
{/literal}
registerFieldDependency("{{$dependantFieldId}}", "{{$dependencyField}}", "{{$dependencyValue}}");
</script>
=====================================
templates/plugin/output/dialog.tpl
=====================================
@@ -18,4 +18,4 @@
</div>
</div>
</div>
-<script type="module">{literal}import { initializeDialog } from "@jquery-tiki/plugins/dialog";{/literal}initializeDialog("{{$id}}", Boolean("{{$autoOpen}}" === "y"), {{$openAction}});</script> {* It is actually impossible to use proper formatting here, the plugin parser is introducing a <p> wherever it encounters a line break. *}
+<script type="module">{literal}import { initializeDialog } from "@tiki/plugins/dialog";{/literal}initializeDialog("{{$id}}", Boolean("{{$autoOpen}}" === "y"), {{$openAction}});</script> {* It is actually impossible to use proper formatting here, the plugin parser is introducing a <p> wherever it encounters a line break. *}
=====================================
templates/plugin/output/pagetabs.tpl
=====================================
@@ -5,4 +5,4 @@
{/foreach}
{/tabset}
-<script type="module">import loadTabsContent from "@jquery-tiki/plugins/pagetabs";loadTabsContent('pagetabs{$id}');</script>
+<script type="module">import loadTabsContent from "@tiki/plugins/pagetabs";loadTabsContent('pagetabs{$id}');</script>
=====================================
templates/plugin/types/buttons.tpl
=====================================
@@ -1,6 +1,6 @@
<script type="module">
{literal}
- import { submitNewButton, generateButtonsFromInput } from '@jquery-tiki/plugin-edit';
+ import { submitNewButton, generateButtonsFromInput } from '@tiki/plugin-base/buttonParamHandler';
{/literal}
window.submitNewButton = submitNewButton;
=====================================
tiki-webmail.php
=====================================
@@ -150,7 +150,7 @@ if (isset($_POST['display']) && $_POST['display'] == 'pdf') {
$headerlib->add_cssfile(BOOTSTRAP_ICONS_FONT_PATH . '/bootstrap-icons.css');
-$headerlib->add_js_module('import "@jquery-tiki/plugins/cypht";');
+$headerlib->add_js_module('import "@jquery-tiki/cypht";');
$smarty->display('tiki.tpl');
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/07b1e81ce6f8b6f9a4734aa47ed5525fc1c78ca7
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/07b1e81ce6f8b6f9a4734aa47ed5525fc1c78ca7
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs