Skip to content

replace & with unescaped ampersand in brain viewers #300

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

replace & with unescaped ampersand in brain viewers #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae54595
replace & with unescaped ampersand in brain viewers (see cbrain#1…
MontrealSergiy Apr 3, 2025
63dd08a
shorten code by using an alias replace & with unescaped ampersand…
MontrealSergiy Apr 3, 2025
5bac032
minc bugfix
MontrealSergiy Apr 3, 2025
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
8 changes: 4 additions & 4 deletions userfiles/civet_output/views/_surface_viewer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,12 @@
////////////////////////////////////

viewer.loadModelFromURL(
"<%= content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=<%= @userfile.name + "/" + @userfile.surfaces_dir %>/" + "<%= @userfile.surfaces_objs[0]%>",
"<%= raw j content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=<%= @userfile.name + "/" + @userfile.surfaces_dir %>/" + "<%= @userfile.surfaces_objs[0]%>",
{
complete: function() {
viewer.loadColorMapFromURL(color_maps[0].url);
viewer.loadIntensityDataFromURL(
"<%= content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=<%= @userfile.overlays[0][1] %>",
"<%= raw j content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=<%= @userfile.overlays[0][1] %>",
{
name: "<%= @userfile.overlays[0][0] %>",
complete: loadEnd
Expand Down Expand Up @@ -472,7 +472,7 @@
viewer.clearScreen();
loadStart();
viewer.loadModelFromURL(
"<%= content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=<%= @userfile.name + "/" + @userfile.surfaces_dir %>/" + $(event.target).val(),
"<%= raw j content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=<%= @userfile.name + "/" + @userfile.surfaces_dir %>/" + $(event.target).val(),
{
complete: loadEnd
}
Expand All @@ -484,7 +484,7 @@
var filename = $(event.target).val()
var basename = filename.replace(/\\/g,'/').replace( /.*\//, '' )
viewer.loadIntensityDataFromURL(
"<%= content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=" + filename,
"<%= raw j content_userfile_path(@userfile) %>?content_loader=collection_file&arguments=" + filename,
{
name: basename,
complete: loadEnd
Expand Down
2 changes: 1 addition & 1 deletion userfiles/mgh_file/views/_volume_viewer_loader.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ viewer.loadVolumes({
volumes: [
{
type: "mgh",
url: "<%= content_userfile_path(@userfile, :content_loader => :raw_content, :file_name => @userfile.name, :viewer_userfile_class => :MghFile) %>",
url: "<%= raw j content_userfile_path(@userfile, :content_loader => :raw_content, :file_name => @userfile.name, :viewer_userfile_class => :MghFile) %>",
template: {
element_id: "volume-ui-template-<%= @userfile.id %>",
viewer_insert_class: "volume-viewer-display"
Expand Down
2 changes: 1 addition & 1 deletion userfiles/minc_file/views/_minc_navigator.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ with MINC2 files (which are HDF5-based).

// Values obtained from Rails server side
var link_id = "<%= link_id %>";
var url = "<%= content_userfile_path(@userfile, :content_loader => :minc_content) %>";
var url = "<%= raw j content_userfile_path(@userfile, :content_loader => :minc_content) %>";

// Our main launch link.
var start_link = $("#"+link_id);
Expand Down
2 changes: 1 addition & 1 deletion userfiles/minc_file/views/_volume_viewer_loader.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ viewer.loadVolumes({
{
type: "minc",
header_url: false,
raw_data_url: "<%= content_userfile_path(@userfile, :content_loader => :minc_content, :file_name => @userfile.name, :viewer_userfile_class => :MincFile) %>",
raw_data_url: "<%= raw j content_userfile_path(@userfile, :content_loader => :minc_content, :file_name => @userfile.name, :viewer_userfile_class => :MincFile) %>",
template: {
element_id: "volume-ui-template-<%= @userfile.id %>",
viewer_insert_class: "volume-viewer-display"
Expand Down
2 changes: 1 addition & 1 deletion userfiles/nifti_file/views/_volume_viewer_loader.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ viewer.loadVolumes({
volumes: [
{
type: "nifti1",
nii_url: "<%= content_userfile_path(@userfile, :content_loader => :raw_content, :file_name => @userfile.name, :viewer_userfile_class => :NiftiFile) %>",
nii_url: "<%= raw j content_userfile_path(@userfile, :content_loader => :raw_content, :file_name => @userfile.name, :viewer_userfile_class => :NiftiFile) %>",
template: {
element_id: "volume-ui-template-<%= @userfile.id %>",
viewer_insert_class: "volume-viewer-display"
Expand Down
2 changes: 1 addition & 1 deletion userfiles/ply_file/views/_ply_viewer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ It is not garanteed to work well.

// Values obtained from Rails server side
var link_id = "<%= link_id %>";
var url = "<%= content_userfile_path(@userfile, :content_loader => :ply_content) %>";
var url = "<%= raw j content_userfile_path(@userfile, :content_loader => :ply_content) %>";

// Our main launch link.
var start_link = $("#"+link_id);
Expand Down