Skip to content

Fix workflow editor #1203

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
fbacall wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix workflow editor #1203

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
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
//= require bootstrap-tab-history
//= require cytoscape
//= require cytoscape-panzoom
//= require jscolor
//= require jquery.simplecolorpicker.js
//= require split
//= require handlebars.runtime
Expand Down
22 changes: 18 additions & 4 deletions app/assets/javascripts/workflows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@ var Workflows = {
$('#node-modal-form-title').val(data.name);
$('#node-modal-form-description').val(data.description);
if (data.color) {
$('#node-modal-form-colour')[0].jscolor.fromString(data.color);
$('#node-modal-form-colour').val(data.color);
} else if (data.parent) {
$('#node-modal-form-colour')[0].jscolor.fromString(cy.$('#' + data.parent).data('color'));
$('#node-modal-form-colour').val(cy.$('#' + data.parent).data('color'));
}
$('#node-modal-form-parent-id').val(data.parent);
$('#node-modal-form-x').val(position.x);
Expand All @@ -211,7 +211,7 @@ var Workflows = {
description: $('#node-modal-form-description').val(),
html_description: MarkdownIt.render($('#node-modal-form-description').val()),
color: $('#node-modal-form-colour').val(),
font_color: $('#node-modal-form-colour').css("color"),
font_color: Workflows.getTextColor($('#node-modal-form-colour').val()),
parent: $('#node-modal-form-parent-id').val(),
associatedResources: Workflows.associatedResources.fetch(),
ontologyTerms: Workflows.ontologyTerms.fetch()
Expand Down Expand Up @@ -470,6 +470,21 @@ var Workflows = {
);
}
}
},
getTextColor: function (hex) {
// Remove the leading '#', if present
hex = hex.replace('#', '');

// Parse r, g, b values
const r = parseInt(hex.substring(0, 2), 16);
const g = parseInt(hex.substring(2, 4), 16);
const b = parseInt(hex.substring(4, 6), 16);

// Calculate perceived brightness (luminance)
const brightness = (0.299 * r) + (0.587 * g) + (0.114 * b);

// Threshold of ~186 is a common practical cutoff
return brightness > 186 ? '#000000' : '#FFFFFF';
}
};

Expand Down Expand Up @@ -621,7 +636,6 @@ document.addEventListener("turbolinks:load", function() {
// Initialize
Workflows.cancelState();
Workflows.history.initialize();
jscolor.installByClassName('jscolor');
} else {
// Hiding/revealing of child nodes
if(hideChildNodes) {
Expand Down
2 changes: 1 addition & 1 deletion app/views/workflows/_node_modal.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<p style="margin: 0px; padding: 5px;">
Click inside the box below to select colour using colour picker:
</p>
<input type="text" class="form-control jscolor {hash:true, zIndex: 100000}" value="#F0721E" id="node-modal-form-colour">
<input type="color" class="form-control" value="#F0721E" id="node-modal-form-colour">
<p style="background-color: #E7E7E7; margin-top: 5px; padding: 5px;">
Or select from pre-defined colours:
<%= render 'workflows/partials/simple_colour_picker' %>
Expand Down
5 changes: 1 addition & 4 deletions app/views/workflows/partials/_simple_colour_picker.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@
<%= select_tag '', options_for_select(predefined_colours), id: 'simple-colour-picker' %>
<script>
document.addEventListener("turbolinks:load", function() {
$('#simple-colour-picker').simplecolorpicker();

$('#simple-colour-picker').on('change', function (e) {
$('#simple-colour-picker').simplecolorpicker().on('change', function (e) {
var valueSelected = this.value.toUpperCase();
$('#node-modal-form-colour').val(valueSelected);
$('#node-modal-form-colour')[0].jscolor.fromString(valueSelected);
});
});
</script>
Loading