Commit 4bb95239 authored by Caillat Michel's avatar Caillat Michel
Browse files

Replaced window.location.origin by <%=urlRoot%> for the destination of the files created for SAMP

parent 78638291
......@@ -2183,8 +2183,7 @@ var SAMPPNGPublishControl = (function (Control) {
var _sendSpectrum = function(connection) {
console.log("var _sendSpectrum = function(connection) {: entering");
var baseUrl = window.location.origin;
var tabUrl = baseUrl+_spectrumPath;
var tabUrl = "<%=urlRoot%>/"+_spectrumPath;
var msg = new samp.Message("table.load.fits", {"table-id": "spectrum", "url": tabUrl, "name": "Artemix"});
connection.notifyAll([msg]);
console.log("var _sendSpectrum = function(connection) {: exiting");
......@@ -2197,7 +2196,7 @@ var SAMPPNGPublishControl = (function (Control) {
var _sendPNGSlice = function(connection) {
console.log("var _sendPNGSlice = function(connection) {: entering");
var baseUrl = window.location.origin;
var pngUrl = baseUrl+_relSlicePNGPath;
var pngUrl = "<%=urlRoot%>/"+_relSlicePNGPath;
console.log("About to send this message 'load "+pngUrl+"' to the HUB" );
var msg = new samp.Message("script.aladin.send", {"script": "load "+pngUrl});
......@@ -2212,19 +2211,17 @@ var SAMPPNGPublishControl = (function (Control) {
var _sendPNGSummedSlices = function(connection) {
console.log("var _sendPNGSummedSlices = function(connection) {: entering");
var baseUrl = window.location.origin;
var pngUrl = baseUrl+_relSummedSlicesPNGPath;
var pngUrl = "<%=urlRoot%>/"+_relSummedSlicesPNGPath;
console.log("About to send this message 'load "+pngUrl+"' to the HUB" );
var msg = new samp.Message("script.aladin.send", {"script": "load "+pngUrl});
connection.notifyAll([msg]);
console.log("var _sendPNGSummedSlices = function(connection) {: entering");
console.log("var _sendPNGSummedSlices = function(connection) {: exiting");
}
var _sendAverageSpectrum = function(connection) {
console.log("var _sendAverageSpectrum = function(connection) {: entering");
var baseUrl = window.location.origin;
var tabUrl = baseUrl+_averageSpectrumPath;
var tabUrl = "<%=urlRoot%>/"+_averageSpectrumPath;
var msg = new samp.Message("table.load.fits", {
"table-id": "spectrum average",
"url": tabUrl,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment