Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git rid of JQuery from ToolHelp.vue #14652

Draft
wants to merge 5 commits into
base: dev
Choose a base branch
from
Draft

Git rid of JQuery from ToolHelp.vue #14652

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0d6ea0
Git rid of JQuery from ToolHelp.vue
Sep 19, 2022
d8b73c6
Unneccesary id attribute was removed
Sep 19, 2022
c9a9c86
Worked on suggested changes
Sep 21, 2022
c020f49
Format and ESLINT fix
Sep 21, 2022
813870f
Added checks for rendering in correct fomat
Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions client/src/components/Tool/ToolHelp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
<template>
<div class="form-help form-text mt-4" v-html="formattedContent" />
<div class="form-help form-text mt-4" v-html="content" />
</template>

<script>
import $ from "jquery";
import { getAppRoot } from "onload/loadConfig";

export default {
props: {
content: {
type: String,
required: true,
},
},
computed: {
formattedContent() {
const $tmpl = $("<div/>").append(this.content);
Copy link
Member

@dannon dannon Sep 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this substantively changes the incoming content, to me, and that functionality would need to be updated instead of dropped?

i.e. -- it makes all of the anchors target a new window, and it rewrites static references in the tool help.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this PR turned green, and it should probably not :)
Please add some tests to make sure that the result is really the same before and after your modifications.

$tmpl.find("a").attr("target", "_blank");
$tmpl.find("img").each(function () {
const img_src = $(this).attr("src");
if (img_src.indexOf("admin_toolshed") !== -1) {
$(this).attr("src", getAppRoot() + img_src);
}
});
return $tmpl.html();
},
},
};
</script>