scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from okriuchykhin/ok_SCI_670

Browse source 
Fix project canvas interactivity in the tutorial [SCI-670]
This commit is contained in:
okriuchykhin 2016-11-16 11:32:13 +01:00 committed by GitHub
parent 4b8824ca16 410837e6cf
commit 43b85ac5c2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/projects/canvas.js.erb
View file

@ -3123,7 +3123,6 @@ function initJsPlumb(containerSel, containerChildSel, modulesSel, params) {
// Initialize first-time tutorial
function initializeTutorial(isEditMode) {
if (showTutorial()) {
canvas_tutorial_helper();
var currentStep = Cookies.get('current_tutorial_step');
// Add edit canvas tutorial step and show it
if (!isEditMode && currentStep > 4 && currentStep < 8) {
@ -3162,12 +3161,12 @@ function initializeTutorial(isEditMode) {
})
.goToStep(currentStep == "6" ? 2 : 1)
.start();
canvas_tutorial_helper();
window.onresize = function() {
$(".introjs-tooltip").css("right", ($("#canvas-container").width() + 20) + "px");
};
} else if (isEditMode && currentStep > 6 && currentStep < 10) {
canvas_tutorial_helper();
var editWorkflowTutorial = $("#canvas-container").attr("data-edit-workflow-step-text");
var editWorkflowClickSaveTutorial = $("#canvas-container").attr("data-edit-workflow-click-save-step-text");
$(".introjs-overlay").remove();
@ -3215,6 +3214,7 @@ function initializeTutorial(isEditMode) {
}
})
.start();
canvas_tutorial_helper();
}, 500);
// Destroy first-time tutorial cookies when skip tutorial
@ -3229,7 +3229,6 @@ function initializeTutorial(isEditMode) {
});
}, 600);
} else if (!isEditMode && currentStep > 8 && currentStep < 13) {
canvas_tutorial_helper();
var sidebarTutorial = $("#canvas-container").attr("data-sidebar-step-text");
var sidebarClickModuleTutorial = $("#canvas-container").attr("data-sidebar-click-module-step-text");
var qpcrModuleLeaf = $("li.leaf[data-module-id='" + tutorialData[0].qpcr_module + "']");
@ -3272,6 +3271,7 @@ function initializeTutorial(isEditMode) {
})
.goToStep(currentStep == "10" ? 2 : 1)
.start();
canvas_tutorial_helper();
}
@ -3291,7 +3291,7 @@ function canvas_tutorial_helper(){
if( $('div').hasClass('introjs-overlay') ){
$('#slide-panel')
.css({'pointer-events': 'none'});
$('#canvas-new-module')
$('#canvas-container')
.css({'pointer-events': 'none'});
$.each( $('.panel-default'), function(i, el){
@ -3309,7 +3309,7 @@ function canvas_tutorial_helper(){
}
function restore_after_tutorial(){
$('#canvas-new-module')
$('#canvas-container')
.css({'pointer-events': 'auto'});
$('#slide-panel')
.css({'pointer-events': 'auto'});