X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2f9cb34a07fcd98effda2fa900e48c31813f14c8..eb769f1b951951ebd6cb55060f2f61a8c25d5aac:/redakcja/static/js/catalogue/catalogue.js diff --git a/redakcja/static/js/catalogue/catalogue.js b/redakcja/static/js/catalogue/catalogue.js index 2b5a9420..04fedce7 100755 --- a/redakcja/static/js/catalogue/catalogue.js +++ b/redakcja/static/js/catalogue/catalogue.js @@ -36,8 +36,8 @@ weekStart: 1, onRender: function(date) { return date.valueOf() < now.valueOf() ? 'disabled' : ''; - }, - }).on('changeDate', function(ev) { + } + }).on('changeDate', function() { checkout.hide(); }).data('datepicker'); }); @@ -47,40 +47,52 @@ var helpdiv = $(this).next(); if (helpdiv.hasClass('help-text')) { var helptext = $("option:selected", this).attr('data-help'); - helpdiv.html($("option:selected", this).attr('data-help') || ''); + helpdiv.html(helptext || ''); } }); + if ($.isFunction($.fn.chosen)) { + $('.chosen-select').chosen().each(function () { + var widget = $(this.nextSibling), $t = $(this); + $.each($.merge([], this.attributes), function () { + if (this.name.substr(0, 5) === 'data-') { + $t.removeAttr(this.name); + widget.attr(this.name, this.value); + } + }); + }); + } // tutorial mode - var tutorial; + var tutorial, tutorial_no; var start; var first_reset = true; function tutreset() { if (start) $(start).popover('hide'); start = null; + tutorial_no = null; + var all_tutorial = $('[data-toggle="tutorial"]'); - tutorial = $.makeArray($('[data-toggle="tutorial"]').sort( - function(a, b) {return $(a).attr('data-tutorial') < $(b).attr('data-tutorial') ? -1 : 1} + function sortKey(a) { + return parseInt($(a).attr('data-tutorial')); + } + tutorial = $.makeArray(all_tutorial.sort( + function(a, b) {return sortKey(a) < sortKey(b) ? -1 : 1} )); if (first_reset) { $.each(tutorial, function(i, e) { - var but = (i < tutorial.length - 1) ? '>>' : 'OK'; + var but = (i < tutorial.length - 1) ? '>>' : 'OK', + but_prev_html = i === 0 ? '' : '<<'; $(e).popover({ - title: 'Tutorial', + title: '×Tutorial', trigger: 'focus', - template: '
' - }).on('shown.bs.popover', function () { - if (!$(e).data('tut-yet')) { - $("#tutoff"+i).on('click', tutoff); - $("#nt"+i).on('click', tut); - $(e).data('tut-yet', 'yes'); - } + html: 'true', + template: '