Quiz And Survey Master (Formerly Quiz Master Next) - Version 5.3.2

Version Description

Upgrade for fix for Divi conflict

Download this release

Release Info

Developer fpcorso
Plugin Icon 128x128 Quiz And Survey Master (Formerly Quiz Master Next)
Version 5.3.2
Comparing to
See all releases

Code changes from version 5.3.1 to 5.3.2

Files changed (11) hide show
  1. js/qmn_quiz.js +39 -33
  2. mlw_quizmaster2.php +3 -3
  3. php/admin/about-page.php +1 -0
  4. php/classes/class-qmn-quiz-manager.php +1 -1
  5. readme.txt +7 -1
  6. templates/qmn_amethyst.css +2 -1
  7. templates/qmn_base.css +2 -1
  8. templates/qmn_emerald.css +2 -1
  9. templates/qmn_gray.css +2 -1
  10. templates/qmn_primary.css +7 -6
  11. templates/qmn_turquoise.css +2 -1
js/qmn_quiz.js CHANGED
@@ -10,7 +10,7 @@ var QSM;
10
  (function ($) {
11
  QSM = {
12
  init: function() {
13
- if (qmn_quiz_data) {
14
  _.each( qmn_quiz_data, function( quiz ) {
15
  quizID = parseInt( quiz.quiz_id );
16
  QSM.initPagination( quizID );
@@ -64,6 +64,7 @@ var QSM;
64
  template = wp.template( 'qsm-pagination' );
65
  $quizForm.append( template() );
66
  if ( '1' == qmn_quiz_data[ quizID ].progress_bar ) {
 
67
  qmn_quiz_data[ quizID ].bar = new ProgressBar.Line('#qsm-progress-bar', {
68
  strokeWidth: 2,
69
  easing: 'easeInOut',
@@ -190,9 +191,12 @@ var qmn_timer_activated = false;
190
  var qsmTitleText = window.document.title;
191
 
192
  function qmnTimeTakenTimer() {
193
- var x = +document.getElementById("timer").value;
 
 
 
194
  x = x + 1;
195
- document.getElementById("timer").value = x;
196
  }
197
 
198
  function qsmEndTimeTakenTimer() {
@@ -335,7 +339,7 @@ function qmnDisplayResults( results, quiz_form_id, $container ) {
335
  }
336
 
337
  function qmnInit() {
338
- if (qmn_quiz_data) {
339
  for ( var key in qmn_quiz_data ) {
340
  if ( qmn_quiz_data[key].ajax_show_correct === '1' ) {
341
  jQuery( '#quizForm' + qmn_quiz_data[key].quiz_id + ' .qmn_quiz_radio').change(function() {
@@ -599,10 +603,24 @@ function qmnInitPagination( quiz_id ) {
599
  .append( '<div class="qmn_page_counter_message"></div>' )
600
  .append( '<a class="qmn_btn mlw_qmn_quiz_link mlw_next" href="#">' + qmn_quiz_data[quiz_id].pagination.next_text + '</a>' );
601
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
602
  if ( qmn_quiz_data[quiz_id].first_page ) {
603
- qmnNextSlide( 1, 0, '#quizForm' + quiz_id );
604
  } else {
605
- qmnNextSlide( qmn_quiz_data[quiz_id].pagination.amount, 0, '#quizForm' + quiz_id );
606
  }
607
  }
608
 
@@ -625,33 +643,21 @@ function qmnSocialShare( network, mlw_qmn_social_text, mlw_qmn_title, facebook_i
625
  return false;
626
  }
627
 
628
- qmnInit();
629
-
630
- jQuery(".mlw_next").click(function(event) {
631
- event.preventDefault();
632
- var quiz_id = +jQuery( this ).closest( '.qmn_quiz_container' ).find( '.qmn_quiz_id' ).val();
633
- if ( qmnValidatePage( 'quizForm' + quiz_id ) ) {
634
- qmnNextSlide( qmn_quiz_data[quiz_id].pagination.amount, 1, '#quizForm' + quiz_id );
635
- }
636
- });
637
-
638
- jQuery(".mlw_previous").click(function(event) {
639
- event.preventDefault();
640
- var quiz_id = +jQuery( this ).closest( '.qmn_quiz_container' ).find( '.qmn_quiz_id' ).val();
641
- qmnPrevSlide( qmn_quiz_data[quiz_id].pagination.amount, 1, '#quizForm' + quiz_id );
642
- });
643
-
644
- jQuery( '.qmn_quiz_container' ).tooltip();
645
-
646
- jQuery( '.qmn_quiz_container input' ).on( 'keypress', function ( e ) {
647
- if ( e.which === 13 ) {
648
- e.preventDefault();
649
- }
650
- });
651
-
652
- jQuery( '.qmn_quiz_form' ).on( "submit", function( event ) {
653
- event.preventDefault();
654
- qmnFormSubmit( this.id );
655
  });
656
 
657
  var qsmTimerInterval = setInterval( qmnTimeTakenTimer, 1000 );
10
  (function ($) {
11
  QSM = {
12
  init: function() {
13
+ if ( typeof qmn_quiz_data != 'undefined' && qmn_quiz_data) {
14
  _.each( qmn_quiz_data, function( quiz ) {
15
  quizID = parseInt( quiz.quiz_id );
16
  QSM.initPagination( quizID );
64
  template = wp.template( 'qsm-pagination' );
65
  $quizForm.append( template() );
66
  if ( '1' == qmn_quiz_data[ quizID ].progress_bar ) {
67
+ $( '#qsm-progress-bar' ).show();
68
  qmn_quiz_data[ quizID ].bar = new ProgressBar.Line('#qsm-progress-bar', {
69
  strokeWidth: 2,
70
  easing: 'easeInOut',
191
  var qsmTitleText = window.document.title;
192
 
193
  function qmnTimeTakenTimer() {
194
+ var x = +jQuery( '#timer' ).val();
195
+ if ( NaN === x ) {
196
+ x = 0;
197
+ }
198
  x = x + 1;
199
+ jQuery( '#timer' ).val( x );
200
  }
201
 
202
  function qsmEndTimeTakenTimer() {
339
  }
340
 
341
  function qmnInit() {
342
+ if ( typeof qmn_quiz_data != 'undefined' && qmn_quiz_data ) {
343
  for ( var key in qmn_quiz_data ) {
344
  if ( qmn_quiz_data[key].ajax_show_correct === '1' ) {
345
  jQuery( '#quizForm' + qmn_quiz_data[key].quiz_id + ' .qmn_quiz_radio').change(function() {
603
  .append( '<div class="qmn_page_counter_message"></div>' )
604
  .append( '<a class="qmn_btn mlw_qmn_quiz_link mlw_next" href="#">' + qmn_quiz_data[quiz_id].pagination.next_text + '</a>' );
605
 
606
+ jQuery(".mlw_next").click(function(event) {
607
+ event.preventDefault();
608
+ var quiz_id = +jQuery( this ).closest( '.qmn_quiz_container' ).find( '.qmn_quiz_id' ).val();
609
+ if ( qmnValidatePage( 'quizForm' + quiz_id ) ) {
610
+ qmnNextSlide( qmn_quiz_data[quiz_id].pagination.amount, 1, '#quizForm' + quiz_id );
611
+ }
612
+ });
613
+
614
+ jQuery(".mlw_previous").click(function(event) {
615
+ event.preventDefault();
616
+ var quiz_id = +jQuery( this ).closest( '.qmn_quiz_container' ).find( '.qmn_quiz_id' ).val();
617
+ qmnPrevSlide( qmn_quiz_data[quiz_id].pagination.amount, 1, '#quizForm' + quiz_id );
618
+ });
619
+
620
  if ( qmn_quiz_data[quiz_id].first_page ) {
621
+ qmnNextSlide( 1, 0, '#quizForm' + quiz_id );
622
  } else {
623
+ qmnNextSlide( qmn_quiz_data[quiz_id].pagination.amount, 0, '#quizForm' + quiz_id );
624
  }
625
  }
626
 
643
  return false;
644
  }
645
 
646
+ jQuery(function() {
647
+ qmnInit();
648
+
649
+ jQuery( '.qmn_quiz_container' ).tooltip();
650
+
651
+ jQuery( '.qmn_quiz_container input' ).on( 'keypress', function ( e ) {
652
+ if ( e.which === 13 ) {
653
+ e.preventDefault();
654
+ }
655
+ });
656
+
657
+ jQuery( '.qmn_quiz_form' ).on( "submit", function( event ) {
658
+ event.preventDefault();
659
+ qmnFormSubmit( this.id );
660
+ });
 
 
 
 
 
 
 
 
 
 
 
 
661
  });
662
 
663
  var qsmTimerInterval = setInterval( qmnTimeTakenTimer, 1000 );
mlw_quizmaster2.php CHANGED
@@ -2,14 +2,14 @@
2
  /**
3
  * Plugin Name: Quiz And Survey Master
4
  * Description: Easily and quickly add quizzes and surveys to your website.
5
- * Version: 5.3.1
6
  * Author: Frank Corso
7
  * Author URI: https://www.quizandsurveymaster.com/
8
  * Plugin URI: https://www.quizandsurveymaster.com/
9
  * Text Domain: quiz-master-next
10
  *
11
  * @author Frank Corso
12
- * @version 5.3.1
13
  * @package QSM
14
  */
15
 
@@ -33,7 +33,7 @@ class MLWQuizMasterNext {
33
  * @var string
34
  * @since 4.0.0
35
  */
36
- public $version = '5.3.1';
37
 
38
  /**
39
  * QSM Alert Manager Object
2
  /**
3
  * Plugin Name: Quiz And Survey Master
4
  * Description: Easily and quickly add quizzes and surveys to your website.
5
+ * Version: 5.3.2
6
  * Author: Frank Corso
7
  * Author URI: https://www.quizandsurveymaster.com/
8
  * Plugin URI: https://www.quizandsurveymaster.com/
9
  * Text Domain: quiz-master-next
10
  *
11
  * @author Frank Corso
12
+ * @version 5.3.2
13
  * @package QSM
14
  */
15
 
33
  * @var string
34
  * @since 4.0.0
35
  */
36
+ public $version = '5.3.2';
37
 
38
  /**
39
  * QSM Alert Manager Object
php/admin/about-page.php CHANGED
@@ -51,6 +51,7 @@ function mlw_generate_about_page() {
51
  </div>
52
  <div class="qsm-tab-content tab-2" style="display: none;">
53
  <h2>Changelog</h2>
 
54
  <?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 51 ); ?>
55
  <?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 50 ); ?>
56
  </div>
51
  </div>
52
  <div class="qsm-tab-content tab-2" style="display: none;">
53
  <h2>Changelog</h2>
54
+ <?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 52 ); ?>
55
  <?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 51 ); ?>
56
  <?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 50 ); ?>
57
  </div>
php/classes/class-qmn-quiz-manager.php CHANGED
@@ -516,7 +516,7 @@ class QMNQuizManager {
516
  <a class="qsm-btn qsm-previous qmn_btn mlw_qmn_quiz_link mlw_previous" href="#"><?php echo esc_html( $options->previous_button_text ); ?></a>
517
  <span class="qmn_page_message"></span>
518
  <div class="qmn_page_counter_message"></div>
519
- <div id="qsm-progress-bar"></div>
520
  <a class="qsm-btn qsm-next qmn_btn mlw_qmn_quiz_link mlw_next" href="#"><?php echo esc_html( $options->next_button_text ); ?></a>
521
  <input type='submit' class='qsm-btn qsm-submit-btn qmn_btn' value='<?php echo esc_attr( htmlspecialchars_decode( $options->submit_button_text, ENT_QUOTES ) ); ?>' />
522
  </div>
516
  <a class="qsm-btn qsm-previous qmn_btn mlw_qmn_quiz_link mlw_previous" href="#"><?php echo esc_html( $options->previous_button_text ); ?></a>
517
  <span class="qmn_page_message"></span>
518
  <div class="qmn_page_counter_message"></div>
519
+ <div id="qsm-progress-bar" style="display:none;"></div>
520
  <a class="qsm-btn qsm-next qmn_btn mlw_qmn_quiz_link mlw_next" href="#"><?php echo esc_html( $options->next_button_text ); ?></a>
521
  <input type='submit' class='qsm-btn qsm-submit-btn qmn_btn' value='<?php echo esc_attr( htmlspecialchars_decode( $options->submit_button_text, ENT_QUOTES ) ); ?>' />
522
  </div>
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: quiz, survey, lead, test, score, exam, questionnaire, question
4
  Requires at least: 4.8
5
  Tested up to: 4.9
6
  Requires PHP: 5.2
7
- Stable tag: 5.3.1
8
  License: GPLv2
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -111,6 +111,9 @@ This is usually a theme conflict. You can [checkout out our common conflict solu
111
 
112
  == Changelog ==
113
 
 
 
 
114
  = 5.3.1 (May 21, 2018) =
115
  * Closed Enhancement: Add user ID to admin results page table - ([Issue #682](https://github.com/fpcorso/quiz_master_next/issues/682))
116
  * Closed Enhancement: Integrate with WordPress 4.9.6 GDPR features - ([Issue #681](https://github.com/fpcorso/quiz_master_next/issues/681))
@@ -126,5 +129,8 @@ This is usually a theme conflict. You can [checkout out our common conflict solu
126
 
127
  == Upgrade Notice ==
128
 
 
 
 
129
  = 5.3.1 =
130
  Update for integrations with WordPress 4.9.6 GDPR features
4
  Requires at least: 4.8
5
  Tested up to: 4.9
6
  Requires PHP: 5.2
7
+ Stable tag: 5.3.2
8
  License: GPLv2
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
111
 
112
  == Changelog ==
113
 
114
+ = 5.3.2 (June 7, 2018) =
115
+ * Closed Plugin Compatibility: Conflict with Divi Builder ([Issue #686](https://api.github.com/repos/fpcorso/quiz_master_next/issues/686))
116
+
117
  = 5.3.1 (May 21, 2018) =
118
  * Closed Enhancement: Add user ID to admin results page table - ([Issue #682](https://github.com/fpcorso/quiz_master_next/issues/682))
119
  * Closed Enhancement: Integrate with WordPress 4.9.6 GDPR features - ([Issue #681](https://github.com/fpcorso/quiz_master_next/issues/681))
129
 
130
  == Upgrade Notice ==
131
 
132
+ = 5.3.2 =
133
+ Upgrade for fix for Divi conflict
134
+
135
  = 5.3.1 =
136
  Update for integrations with WordPress 4.9.6 GDPR features
templates/qmn_amethyst.css CHANGED
@@ -306,8 +306,9 @@ border: 1px solid #e3e3e3;
306
  flex-direction: column;
307
  padding: 15px 0 15px 0;
308
  border-top: 1px solid #f3f3f3;
 
309
  }
310
-
311
  @media screen and (min-width: 500px) {
312
  .qmn_pagination {
313
  justify-content: space-between;
306
  flex-direction: column;
307
  padding: 15px 0 15px 0;
308
  border-top: 1px solid #f3f3f3;
309
+ max-height: 50px;
310
  }
311
+
312
  @media screen and (min-width: 500px) {
313
  .qmn_pagination {
314
  justify-content: space-between;
templates/qmn_base.css CHANGED
@@ -305,8 +305,9 @@ border: 1px solid #e3e3e3;
305
  flex-direction: column;
306
  padding: 15px 0 15px 0;
307
  border-top: 1px solid #f3f3f3;
 
308
  }
309
-
310
  @media screen and (min-width: 500px) {
311
  .qmn_pagination {
312
  justify-content: space-between;
305
  flex-direction: column;
306
  padding: 15px 0 15px 0;
307
  border-top: 1px solid #f3f3f3;
308
+ max-height: 50px;
309
  }
310
+
311
  @media screen and (min-width: 500px) {
312
  .qmn_pagination {
313
  justify-content: space-between;
templates/qmn_emerald.css CHANGED
@@ -305,8 +305,9 @@ border: 1px solid #e3e3e3;
305
  flex-direction: column;
306
  padding: 15px 0 15px 0;
307
  border-top: 1px solid #f3f3f3;
 
308
  }
309
-
310
  @media screen and (min-width: 500px) {
311
  .qmn_pagination {
312
  justify-content: space-between;
305
  flex-direction: column;
306
  padding: 15px 0 15px 0;
307
  border-top: 1px solid #f3f3f3;
308
+ max-height: 50px;
309
  }
310
+
311
  @media screen and (min-width: 500px) {
312
  .qmn_pagination {
313
  justify-content: space-between;
templates/qmn_gray.css CHANGED
@@ -306,8 +306,9 @@ border: 1px solid #e3e3e3;
306
  flex-direction: column;
307
  padding: 15px 0 15px 0;
308
  border-top: 1px solid #f3f3f3;
 
309
  }
310
-
311
  @media screen and (min-width: 500px) {
312
  .qmn_pagination {
313
  justify-content: space-between;
306
  flex-direction: column;
307
  padding: 15px 0 15px 0;
308
  border-top: 1px solid #f3f3f3;
309
+ max-height: 50px;
310
  }
311
+
312
  @media screen and (min-width: 500px) {
313
  .qmn_pagination {
314
  justify-content: space-between;
templates/qmn_primary.css CHANGED
@@ -300,12 +300,13 @@ border: 1px solid #e3e3e3;
300
  }
301
 
302
  .qmn_pagination {
303
- position: relative;
304
- display: flex;
305
- align-items: stretch;
306
- flex-direction: column;
307
- padding: 15px 0 15px 0;
308
- border-top: 1px solid #f3f3f3;
 
309
  }
310
 
311
  @media screen and (min-width: 500px) {
300
  }
301
 
302
  .qmn_pagination {
303
+ position: relative;
304
+ display: flex;
305
+ align-items: stretch;
306
+ flex-direction: column;
307
+ padding: 15px 0 15px 0;
308
+ border-top: 1px solid #f3f3f3;
309
+ max-height: 50px;
310
  }
311
 
312
  @media screen and (min-width: 500px) {
templates/qmn_turquoise.css CHANGED
@@ -306,8 +306,9 @@ border: 1px solid #e3e3e3;
306
  flex-direction: column;
307
  padding: 15px 0 15px 0;
308
  border-top: 1px solid #f3f3f3;
 
309
  }
310
-
311
  @media screen and (min-width: 500px) {
312
  .qmn_pagination {
313
  justify-content: space-between;
306
  flex-direction: column;
307
  padding: 15px 0 15px 0;
308
  border-top: 1px solid #f3f3f3;
309
+ max-height: 50px;
310
  }
311
+
312
  @media screen and (min-width: 500px) {
313
  .qmn_pagination {
314
  justify-content: space-between;