Skip to content

[JENKINS-76334] Make P4 console annotations work with Jenkins 2.539+ CSP #250

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

Open
daniel-beck wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[JENKINS-76334] Make P4 console annotations work with Jenkins 2.539+ CSP #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions src/main/java/org/jenkinsci/plugins/p4/console/P4ConsoleAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,18 @@ public ConsoleAnnotator<Object> annotate(Object context, MarkupText text) {
private void push(MarkupText text) {
text.hide(0, COMMAND.length());

String head = "<span class=\"titleDiv\">";
String head = "<span class=\"p4-titleDiv\">";
text.addMarkup(COMMAND.length(), head);

StringBuffer sb = new StringBuffer();
sb.append(" <a class=\"linkDiv\" id=\"");
sb.append("p4title" + id);
sb.append("\" href=\"javascript:toggle('");
sb.append(" <a class=\"p4-linkDiv\" href=\"#\" data-content-id=\"");
sb.append("p4content" + id);
sb.append("','");
sb.append("p4title" + id);
sb.append("');\">");
sb.append("\">");
sb.append("+");
sb.append("</a>");
sb.append("</span>");

sb.append("<div class=\"contentDiv\">");
sb.append("<div class=\"p4-contentDiv\">");
sb.append("<div id=\"");
sb.append("p4content" + id);
sb.append("\" style=\"display: none;\">");
Expand Down
9 changes: 9 additions & 0 deletions src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,13 @@ function toggle(showHideDiv, switchTextDiv) {
}
}

Behaviour.specify("a.p4-linkDiv", 'a.p4-linkDiv', 0, function(el) {
el.onclick = function(evt) {
evt.preventDefault();

let contentId = el.dataset.contentId;
let linkId = el.id;

toggle(contentId, linkId);
}
});
8 changes: 4 additions & 4 deletions src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
span.titleDiv {
span.p4-titleDiv {
color: #008000;
}

div.titleDiv {
div.p4-titleDiv {
color: #008000;
}

a.linkDiv {
a.p4-linkDiv {
text-decoration: none;
font-weight: bold;
color: #0000FF;
}

div.contentDiv {
div.p4-contentDiv {
color: #505050;
background-color: #f0f0f0;
}
9 changes: 9 additions & 0 deletions src/main/webapp/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,13 @@ function toggle(showHideDiv, switchTextDiv) {
}
}

Behaviour.specify("a.p4-linkDiv", 'a.p4-linkDiv', 0, function(el) {
el.onclick = function(evt) {
evt.preventDefault();

let contentId = el.dataset.contentId;
let linkId = el.id;

toggle(contentId, linkId);
}
});