Skip to content

Commit

Permalink
Fixed issue: Tour ends automatically when not able to render
Browse files Browse the repository at this point in the history
  • Loading branch information
@lacrioque
lacrioque committed Dec 22, 2017
1 parent f2e36ba commit 8c3c7d5
Show file tree
Hide file tree
Showing 16 changed files with 749 additions and 83 deletions.
2 changes: 1 addition & 1 deletion application/config/version.php
View file
Expand Up @@ -13,7 +13,7 @@


$config['versionnumber'] = '3.0.0'; //The current version of this branch
$config['dbversionnumber'] = 336;
$config['dbversionnumber'] = 337;
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['assetsversionnumber'] = '30000';
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/questions.php
View file
Expand Up @@ -962,7 +962,7 @@ public function getSubquestionRow($surveyid, $gid, $qid, $codes, $language, $fir
'language' => $language,
'title' => $code,
'question' => '',
'relevance' => '',
'relevance' => '1',
'oldCode' => $oldCode,
);
} else {
Expand All @@ -982,7 +982,7 @@ public function getSubquestionRow($surveyid, $gid, $qid, $codes, $language, $fir
'language' => $language,
'title' => $code,
'question' => '',
'relevance' => '',
'relevance' => '1',
'oldCode' => $oldCode,
);
}
Expand Down
650 changes: 642 additions & 8 deletions application/helpers/update/updatedb_helper.php
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion application/views/admin/survey/Question/editQuestion_view.php
View file
Expand Up @@ -306,7 +306,7 @@
?>


<div class="modal fade" tabindex="-1" role="dialog" id="selector__modal_select-question-type">
<div class="modal fade" tabindex="-1" role="dialog" id="selector__modal_select-question-type" style="z-index: 1250">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<?php Yii::app()->getController()->renderPartial('/admin/survey/Question/question_subviews/_question_type_select', ['currentType' => $eqrow['type'], 'aQuestionTypeGroups' => $aQuestionTypeGroups]); ?>
Expand Down
3 changes: 0 additions & 3 deletions assets/packages/adminpanel/build/lsadminpanel.js
View file
Expand Up @@ -36382,9 +36382,6 @@ $(document).on('ready', function () {
this.$store.commit('changeGeneralContainerHeight', generalContainerHeight);
}
},
beforeCreate() {
this.controlWindowSize();
},
created() {
this.controlWindowSize();
window.addEventListener('resize', () => {
Expand Down
2 changes: 1 addition & 1 deletion assets/packages/adminpanel/build/lsadminpanel.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/packages/adminpanel/build/lsadminpanel.min.js
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions assets/packages/adminpanel/src/main.js
View file
Expand Up @@ -43,9 +43,6 @@ $(document).on('ready', function () {
this.$store.commit('changeGeneralContainerHeight', generalContainerHeight);
}
},
beforeCreate() {
this.controlWindowSize();
},
created() {
this.controlWindowSize();
window.addEventListener('resize', () => {
Expand Down
16 changes: 15 additions & 1 deletion assets/packages/lstutorial/build/lstutorial.js
View file
Expand Up @@ -247,6 +247,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
backdropPadding: 0,
redirect: true,
orphan: false,
endOnOrphan: false,
duration: false,
delay: false,
basePath: '',
Expand Down Expand Up @@ -308,6 +309,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
reflexElement: this._options.steps[i].element,
backdropElement: this._options.steps[i].element,
orphan: this._options.orphan,
endOnOrphan: this._options.endOnOrphan,
duration: this._options.duration,
delay: this._options.delay,
template: this._options.template,
Expand Down Expand Up @@ -530,6 +532,11 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
showStepHelper = (function(_this) {
return function(e) {
if (_this._isOrphan(step)) {
if (step.endOnOrphan === true) {
_this._debug("Ended on orphan step " + (_this._current + 1) + ".\nEnd on orphan option is true.");
_this.end();
return;
}
if (step.orphan === false) {
_this._debug("Skip the orphan step " + (_this._current + 1) + ".\nOrphan option is false and the element does not exist or is hidden.");
if (skipToPrevious) {
Expand Down Expand Up @@ -661,7 +668,9 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);

Tour.prototype._debug = function(text) {
if (this._options.debug) {
return window.console.ls.log("Bootstrap Tour '" + this._options.name + "' | " + text);
window.console.ls.group("Bootstrap-Tour");
window.console.ls.log("Bootstrap Tour '" + this._options.name + "' | " + text);
window.console.ls.groupEnd("Bootstrap-Tour");
}
};

Expand Down Expand Up @@ -754,6 +763,9 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
isOrphan = this._isOrphan(step);
step.template = this._template(step, i);
if (isOrphan) {
if(options.endOnOrphan){
this.end();
}
step.element = 'body';
step.placement = 'top';
}
Expand Down Expand Up @@ -18402,6 +18414,8 @@ const globalTourObject = function(){
step.onNext = step.onNext ? eval(step.onNext) : undefined;
step.onShow = step.onShow ? eval(step.onShow) : undefined;
step.onShown = step.onShown ? eval(step.onShown) : undefined;
step.onHide = step.onHide ? eval(step.onHide) : undefined;
step.onHidden = step.onHidden ? eval(step.onHidden) : undefined;
if(window.debugState.backend) { console.ls.log(step); }
return step;
});
Expand Down
2 changes: 1 addition & 1 deletion assets/packages/lstutorial/build/lstutorial.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/packages/lstutorial/build/lstutorial.min.js
View file

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion assets/packages/lstutorial/lib/bootstrap-tour.js
View file
Expand Up @@ -56,6 +56,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
backdropPadding: 0,
redirect: true,
orphan: false,
endOnOrphan: false,
duration: false,
delay: false,
basePath: '',
Expand Down Expand Up @@ -117,6 +118,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
reflexElement: this._options.steps[i].element,
backdropElement: this._options.steps[i].element,
orphan: this._options.orphan,
endOnOrphan: this._options.endOnOrphan,
duration: this._options.duration,
delay: this._options.delay,
template: this._options.template,
Expand Down Expand Up @@ -339,6 +341,11 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
showStepHelper = (function(_this) {
return function(e) {
if (_this._isOrphan(step)) {
if (step.endOnOrphan === true) {
_this._debug("Ended on orphan step " + (_this._current + 1) + ".\nEnd on orphan option is true.");
_this.end();
return;
}
if (step.orphan === false) {
_this._debug("Skip the orphan step " + (_this._current + 1) + ".\nOrphan option is false and the element does not exist or is hidden.");
if (skipToPrevious) {
Expand Down Expand Up @@ -470,7 +477,9 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);

Tour.prototype._debug = function(text) {
if (this._options.debug) {
return window.console.ls.log("Bootstrap Tour '" + this._options.name + "' | " + text);
window.console.ls.group("Bootstrap-Tour");
window.console.ls.log("Bootstrap Tour '" + this._options.name + "' | " + text);
window.console.ls.groupEnd("Bootstrap-Tour");
}
};

Expand Down Expand Up @@ -563,6 +572,9 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
isOrphan = this._isOrphan(step);
step.template = this._template(step, i);
if (isOrphan) {
if(options.endOnOrphan){
this.end();
}
step.element = 'body';
step.placement = 'top';
}
Expand Down
2 changes: 2 additions & 0 deletions assets/packages/lstutorial/src/tours/global-tour-object.js
View file
Expand Up @@ -42,6 +42,8 @@ const globalTourObject = function(){
step.onNext = step.onNext ? eval(step.onNext) : undefined;
step.onShow = step.onShow ? eval(step.onShow) : undefined;
step.onShown = step.onShown ? eval(step.onShown) : undefined;
step.onHide = step.onHide ? eval(step.onHide) : undefined;
step.onHidden = step.onHidden ? eval(step.onHidden) : undefined;
if(window.debugState.backend) { console.ls.log(step); }
return step;
});
Expand Down
46 changes: 26 additions & 20 deletions assets/scripts/admin/answers.js
View file
Expand Up @@ -18,11 +18,11 @@ $(document).on('ready pjax:scriptcomplete', function(){
var scale_id = $(e.relatedTarget).data('scale-id');
var table_id = $(e.relatedTarget).closest('div.action-buttons').siblings('table.answertable').attr('id');

$('#btnqainsert').unbind('click').on('click', function () {
$('#btnqainsert').off('click').on('click', function () {
quickaddlabels(scale_id, 'add', table_id);
});

$('#btnqareplace').unbind('click').on('click', function () {
$('#btnqareplace').off('click').on('click', function () {
quickaddlabels(scale_id, 'replace', table_id);
});
});
Expand All @@ -39,11 +39,17 @@ $(document).on('ready pjax:scriptcomplete', function(){
updaterowproperties();


$(document).on("click", '.btnaddanswer', addinput);
$(document).on("click", '.btndelanswer', deleteinput);
$(document).on("click", '.btnlsbrowser', lsbrowser );
$('.btnaddanswer').on("click.answeroptions", addinput);
$('.btndelanswer').on("click.answeroptions", deleteinput);
$('.btnlsbrowser').on("click.answeroptions", lsbrowser );
});

function rebindClickHandler(){
$('.btnaddanswer').off("click.answeroptions").on("click.answeroptions", addinput);
$('.btndelanswer').off("click.answeroptions").on("click.answeroptions", deleteinput);
$('.btnlsbrowser').off("click.answeroptions").on("click.answeroptions", lsbrowser );
}

function deleteinput(e)
{
e.preventDefault();
Expand Down Expand Up @@ -153,8 +159,8 @@ function addinput(e)
{
e.preventDefault();
var $that = $(this), // The "add" button
$currentRow = $that.parents('.row-container'), // The row containing the "add" button
$currentTable = $that.parents('.answertable'),
$currentRow = $that.closest('.row-container'), // The row containing the "add" button
$currentTable = $that.closest('.answertable'),
$commonId = $currentRow.data('common-id'), // The common id of this row in the other languages
$elDatas = $('#add-input-javascript-datas'), // This hidden element on the page contains various datas for this function
url = $elDatas.data('url'), // Url for the request
Expand All @@ -177,9 +183,9 @@ function addinput(e)
'gid': $elDatas.data('gid'),
'qid': $elDatas.data('qid'),
'codes': $codes,
'scale_id': $(this).data('scale-id'),
'scale_id': $(this).find('i').data('scale-id'),
'type': 'answer',
'position': $(this).data('position'),
'position': $(this).find('i').data('position'),
'languages': $languages,
'assessmentvisible': $elDatas.data('assessmentvisible') == 1,
};
Expand Down Expand Up @@ -207,7 +213,7 @@ function addinput(e)
});

$('#answercount_'+$scaleId).val($position+2);

rebindClickHandler();
},
error : function(html, statut){
console.ls.log(statut);
Expand Down Expand Up @@ -675,12 +681,12 @@ function transferlabels()
}
$('#answers_'+languages[x]+'_'+scale_id+' tbody').append(tablerows);
// Unbind any previous events
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').unbind('focus');
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').off('click.answeroptions');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').off('click.answeroptions');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').off('focus');
// Bind events again
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').click(addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').click(deleteinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').on('click.answeroptions', addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').on('click.answeroptions', deleteinput);
$('#answers_'+languages[x]+'_'+scale_id+' .answer').focus(function(){
if ($(this).val()==newansweroption_text)
{
Expand Down Expand Up @@ -809,11 +815,11 @@ function quickaddlabels(scale_id, addOrReplace, table_id)

$('#answers_'+languages[x]+'_'+scale_id+' tbody').append(tablerows);
// Unbind any previous events
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').unbind('focus');
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').click(addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').click(deleteinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').off('click.answeroptions');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').off('click.answeroptions');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').off('focus');
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').on('click.answeroptions',addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').on('click.answeroptions',deleteinput);
}

for (var x in languages)
Expand Down
49 changes: 27 additions & 22 deletions assets/scripts/admin/subquestions.js
View file
Expand Up @@ -35,10 +35,10 @@ $(document).on('ready pjax:scriptcomplete', function(){
stop: endmove,
update:aftermove,
distance:3});

$('.btnaddanswer').on("click", addinput);
$('.btndelanswer').on("click", deleteinput);
$('.btnlsbrowser').on("click", lsbrowser );
$('.btnaddanswer').on("click.subquestions", addinput);
$('.btndelanswer').on("click.subquestions", deleteinput);
$('.btnlsbrowser').on("click.subquestions", lsbrowser );

//$('.btnaddanswer').click(addinput);
//$('.btndelanswer').click(deleteinput);
Expand All @@ -51,11 +51,11 @@ $(document).on('ready pjax:scriptcomplete', function(){
var scale_id = $(e.relatedTarget).data('scale-id');
var table_id = $(e.relatedTarget).closest('div.action-buttons').siblings('table.answertable').attr('id');

$('#btnqainsert').unbind('click').on('click', function () {
$('#btnqainsert').off('click').on('click', function () {
quickaddlabels(scale_id, 'add', table_id);
});

$('#btnqareplace').unbind('click').on('click', function () {
$('#btnqareplace').off('click').on('click', function () {
quickaddlabels(scale_id, 'replace', table_id);
});
});
Expand All @@ -72,17 +72,22 @@ $(document).on('ready pjax:scriptcomplete', function(){

});

function rebindClickHandler(){
$('.btnaddanswer').off("click.subquestions").on("click.subquestions", addinput);
$('.btndelanswer').off("click.subquestions").on("click.subquestions", deleteinput);
$('.btnlsbrowser').off("click.subquestions").on("click.subquestions", lsbrowser );
}
/**
* Bind relevance equation to expand on click (only once)
*
* @return void
*/
function bindExpandRelevanceEquation()
{
$('.relevance').unbind('click').on('click', function() {
$('.relevance').off('click').on('click', function() {
$('#rel-eq-th').toggleClass('col-md-1 col-md-4', 'fast');
$('.relevance').data('toggle', '').tooltip('destroy');
$('.relevance').unbind('click');
$('.relevance').off('click');
});
}

Expand Down Expand Up @@ -241,8 +246,8 @@ function addinput(e)
{
e.preventDefault();
var $that = $(this), // The "add" button
$currentRow = $that.parents('.row-container'), // The row containing the "add" button
$currentTable = $that.parents('.answertable'),
$currentRow = $that.closest('.row-container'), // The row containing the "add" button
$currentTable = $that.closest('.answertable'),
$commonId = $currentRow.data('common-id'), // The common id of this row in the other languages
$elDatas = $('#add-input-javascript-datas'), // This hidden element on the page contains various datas for this function
$url = $elDatas.data('url'), // Url for the request
Expand All @@ -264,7 +269,7 @@ function addinput(e)
datas += '&gid='+$elDatas.data('gid'),
datas += '&qid='+$elDatas.data('qid'),
datas += '&codes='+$codes,
datas += '&scale_id='+$(this).data('scale-id'),
datas += '&scale_id='+$(this).find('i').data('scale-id'),
datas += '&type=subquestion',
datas += '&position=',
datas += '&languages='+$languages;
Expand All @@ -287,7 +292,7 @@ function addinput(e)
$elRowToUpdate = $('#row_'+lang+'_'+$commonId); // The row for the current language
$elRowToUpdate.after(htmlRow); // We insert the HTML of the new row after this one
});

rebindClickHandler();
},
error : function(html, statut){
alert($errormessage);
Expand Down Expand Up @@ -769,11 +774,11 @@ function transferlabels()

$('#answers_'+languages[x]+'_'+scale_id+' tbody').append(tablerows);
// Unbind any previous events
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').unbind('focus');
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').click(addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').click(deleteinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').off('click.subquestions');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').off('click.subquestions');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').off('focus');
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').on('click.subquestions',addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').on('click.subquestions',deleteinput);

}
/*$('#labelsetbrowser').dialog('close');*/
Expand Down Expand Up @@ -904,11 +909,11 @@ function quickaddlabels(scale_id, addOrReplace, table_id)
//$('#answers_'+languages[x]+'_'+scale_id+' tbody').append(tablerows);

// Unbind any previous events
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').unbind('click');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').unbind('focus');
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').click(addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').click(deleteinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').off('click.subquestions');
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').off('click.subquestions');
$('#answers_'+languages[x]+'_'+scale_id+' .answer').off('focus');
$('#answers_'+languages[x]+'_'+scale_id+' .btnaddanswer').on('click.subquestions', addinput);
$('#answers_'+languages[x]+'_'+scale_id+' .btndelanswer').on('click.subquestions', deleteinput);
}
for (var x in languages)
{
Expand Down

0 comments on commit 8c3c7d5

Please sign in to comment.