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

Merge pull request #107 from ZmagoD/zd_bug_fix

Browse source 
fixes new task button after tutorial ends
This commit is contained in:
Zmago Devetak 2016-08-30 15:04:11 +02:00 committed by GitHub
commit 11b314fa20
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/projects/canvas.js
View file

@ -148,7 +148,6 @@ jsPlumb.ready(function () {
initializeGraph(".diagram .module-large"); initializeGraph(".diagram .module-large");
initializeFullZoom(); initializeFullZoom();
initializeTutorial(false); initializeTutorial(false);
canvas_tutorial_helper();
}); });
//************************************ //************************************
@ -3297,6 +3296,7 @@ function initJsPlumb(containerSel, containerChildSel, modulesSel, params) {
// Initialize first-time tutorial // Initialize first-time tutorial
function initializeTutorial(isEditMode) { function initializeTutorial(isEditMode) {
if (showTutorial()) { if (showTutorial()) {
canvas_tutorial_helper();
var currentStep = Cookies.get('current_tutorial_step'); var currentStep = Cookies.get('current_tutorial_step');
// Add edit canvas tutorial step and show it // Add edit canvas tutorial step and show it
if (!isEditMode && currentStep > 2 && currentStep < 6) { if (!isEditMode && currentStep > 2 && currentStep < 6) {
@ -3340,6 +3340,7 @@ function initializeTutorial(isEditMode) {
$(".introjs-tooltip").css("right", ($("#canvas-container").width() + 20) + "px"); $(".introjs-tooltip").css("right", ($("#canvas-container").width() + 20) + "px");
}; };
} else if (isEditMode && currentStep > 4 && currentStep < 7) { } else if (isEditMode && currentStep > 4 && currentStep < 7) {
canvas_tutorial_helper();
var editWorkflowTutorial = $("#canvas-container").attr("data-edit-workflow-step-text"); var editWorkflowTutorial = $("#canvas-container").attr("data-edit-workflow-step-text");
var editWorkflowClickSaveTutorial = $("#canvas-container").attr("data-edit-workflow-click-save-step-text"); var editWorkflowClickSaveTutorial = $("#canvas-container").attr("data-edit-workflow-click-save-step-text");
$(".introjs-overlay").remove(); $(".introjs-overlay").remove();
@ -3391,6 +3392,7 @@ function initializeTutorial(isEditMode) {
// Destroy first-time tutorial cookies when skip tutorial // Destroy first-time tutorial cookies when skip tutorial
// or end tutorial is clicked // or end tutorial is clicked
setTimeout( function(){
$(".introjs-skipbutton").each(function (){ $(".introjs-skipbutton").each(function (){
$(this).click(function (){ $(this).click(function (){
Cookies.remove('tutorial_data'); Cookies.remove('tutorial_data');
@ -3398,7 +3400,9 @@ function initializeTutorial(isEditMode) {
restore_after_tutorial(); restore_after_tutorial();
}); });
}); });
}, 600);
} else if (!isEditMode && currentStep > 5 || currentStep < 10) { } else if (!isEditMode && currentStep > 5 || currentStep < 10) {
canvas_tutorial_helper();
var sidebarTutorial = $("#canvas-container").attr("data-sidebar-step-text"); var sidebarTutorial = $("#canvas-container").attr("data-sidebar-step-text");
var sidebarClickModuleTutorial = $("#canvas-container").attr("data-sidebar-click-module-step-text"); var sidebarClickModuleTutorial = $("#canvas-container").attr("data-sidebar-click-module-step-text");
Cookies.set('current_tutorial_step', '8'); Cookies.set('current_tutorial_step', '8');
@ -3458,11 +3462,11 @@ function initializeTutorial(isEditMode) {
} }
function canvas_tutorial_helper(){ function canvas_tutorial_helper(){
$(document).ready(function(){ if( $('div').hasClass('introjs-overlay') ){
if( $('div').hasClass('introjs-showElement') ){
$('#slide-panel') $('#slide-panel')
.css({'pointer-events': 'none'}); .css({'pointer-events': 'none'});
$('#canvas-new-module')
.css({'pointer-events': 'none'});
$.each( $('.panel-default'), function(i, el){ $.each( $('.panel-default'), function(i, el){
$(el) $(el)
@ -3476,18 +3480,11 @@ function canvas_tutorial_helper(){
.css({'pointer-events': 'none'}); .css({'pointer-events': 'none'});
}); });
} }
$( document ).ajaxComplete(function() {
$('#canvas-new-module')
.css({'pointer-events': 'none'});
});
});
} }
function restore_after_tutorial(){ function restore_after_tutorial(){
$('#canvas-new-module') $('#canvas-new-module')
.css({'pointer-events': 'auto'}); .css({'pointer-events': 'auto'});
$('#slide-panel') $('#slide-panel')
.css({'pointer-events': 'auto'}); .css({'pointer-events': 'auto'});