From 6640fabae24fb3dc50b44f76674c33d120c86945 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Wed, 4 May 2022 09:44:42 +0200 Subject: [PATCH] [Redizajn 1ka] Question preview popup v0 --- admin/survey/script/branching.js | 2 +- admin/survey/script/script.js | 4 ++-- resources/sass/admin_new/components/popup/popup.scss | 1 + resources/sass/admin_new/components/popup/preview.scss | 0 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 resources/sass/admin_new/components/popup/preview.scss diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js index 9bf277f40..a84cdc2bb 100644 --- a/admin/survey/script/branching.js +++ b/admin/survey/script/branching.js @@ -149,7 +149,7 @@ function branching_click(event) { } // preview spremenljivke - if (ta.is('div.spr_edit a.preview')) { + if (ta.is('div.spr_edit a.monitor')) { var id = ta.parent().attr('id'); id = id.replace('edit_', ''); preview_spremenljivka(id); diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index a5bb8f2ac..45e4981d0 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -3116,13 +3116,13 @@ function survey_chaneg_type_cancle() { $('#fade').fadeOut('slow'); } function preview_spremenljivka(spremenljivka, lang_id) { - $('#fullscreen').html('').fadeIn('slow').draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'}); + $('#fullscreen').html('').fadeIn('slow'); $('#fade').fadeTo('slow', 1); $('#fullscreen').load('ajax.php?a=preview_spremenljivka', {anketa: srv_meta_anketa_id, spremenljivka: spremenljivka, lang_id: lang_id,podstran: srv_meta_podstran}).draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'}); } function preview_spremenljivka_analiza(spremenljivka, lang_id) { - $('#fullscreen').html('').fadeIn('slow').draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'}); + $('#fullscreen').html('').fadeIn('slow'); $('#fade').fadeTo('slow', 1); $('#fullscreen').load('ajax.php?t=analysis&a=preview_spremenljivka', {anketa: srv_meta_anketa_id, spremenljivka: spremenljivka, lang_id: lang_id,podstran: srv_meta_podstran}).draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'}); diff --git a/resources/sass/admin_new/components/popup/popup.scss b/resources/sass/admin_new/components/popup/popup.scss index 5442f4676..86dfec771 100644 --- a/resources/sass/admin_new/components/popup/popup.scss +++ b/resources/sass/admin_new/components/popup/popup.scss @@ -12,3 +12,4 @@ @import "alert"; @import "error"; @import "success_save"; +@import "preview"; diff --git a/resources/sass/admin_new/components/popup/preview.scss b/resources/sass/admin_new/components/popup/preview.scss new file mode 100644 index 000000000..e69de29bb