scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-22 06:44:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #920 from okriuchykhin/ok_SCI_1872

Browse source 
Fix experiment workflow image update indicator [SCI-1872]
This commit is contained in:
okriuchykhin 2017-12-22 16:58:26 +01:00 committed by GitHub
commit a31d616cf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/projects/show.js
View file

@ -4,7 +4,6 @@
function init(){
$("[data-id]").each(function(){
var that = $(this);
that.find(".workflowimg-container").hide();
initProjectExperiment(that);
});
@ -36,7 +35,9 @@
},
error: function (ev) {
if (ev.status == 404) {
setTimeout(checkUpdatedImg(img_url, url, timestamp, container), 500);
setTimeout(function () {
checkUpdatedImg(img_url, url, timestamp, container)
}, 5000);
} else {
animateSpinner(container, false);
}

2
app/views/projects/show/_experiment.html.erb
View file

@ -22,7 +22,7 @@
</div>
<div class="panel-body">
<% if experiment.workflowimg? && experiment.active_modules.length > 0 %>
<% if experiment.active_modules.length > 0 %>
<div class="workflowimg-container"
data-check-img="<%= updated_img_experiment_url(experiment) %>"
data-updated-img="<%= fetch_workflow_img_experiment_url(experiment) %>"