Skip to content

Commit

Permalink
1.1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@nigel-bmlt
nigel-bmlt committed Sep 26, 2023
1 parent b1bf0d2 commit 362dc45
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 93 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## 1.1.9 (Sep 26, 2023)
- Bugfix for javascript naming collision (thanks @Klodd64 !)

## 1.1.8 (Apr 19, 2023)
- Update for italian translation (thanks (CaliforniaSteve!)
- Update for italian translation (thanks @CaliforniaSteve!)
- Tested against Wordpress 6.3

## 1.1.7 (Apr 19, 2023)
Expand Down
4 changes: 2 additions & 2 deletions bmlt-workflow.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
* Plugin Name: BMLT Workflow
* Plugin URI: https://github.com/bmlt-enabled/bmlt-workflow
* Description: Workflows for BMLT meeting management!
* Version: 1.1.8
* Version: 1.1.9
* Requires at least: 5.2
* Tested up to: 6.3
* Author: @nigel-bmlt
* Author URI: https://github.com/nigel-bmlt
**/


define('BMLTWF_PLUGIN_VERSION', '1.1.8');
define('BMLTWF_PLUGIN_VERSION', '1.1.9');

if ((!defined('ABSPATH') && (!defined('BMLTWF_RUNNING_UNDER_PHPUNIT')))) exit; // die if being called directly

Expand Down
50 changes: 25 additions & 25 deletions js/admin_options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/* eslint no-undef: "error" */

/* global wp, jQuery, ClipboardJS */
/* global clear_notices, turn_on_spinner, turn_off_spinner, notice_success, notice_error */
/* global bmltwf_clear_notices, bmltwf_turn_on_spinner, bmltwf_turn_off_spinner, bmltwf_notice_success, bmltwf_notice_error */
/* global bmltwf_admin_restore_rest_url, bmltwf_admin_backup_rest_url, bmltwf_admin_bmltserver_rest_url, bmltwf_fso_feature */
/* global bmltwf_bmlt_server_address, bmltwf_google_maps_key_select, bmltwf_admin_bmltwf_service_bodies_rest_url */

Expand Down Expand Up @@ -99,7 +99,7 @@ jQuery(document).ready(function ($) {

// perform a restore
$('#bmltwf_file_selector').on('change', function () {
clear_notices();
bmltwf_clear_notices();
$('#bmltwf_restore_warning_dialog').dialog('open');
});

Expand All @@ -114,18 +114,18 @@ jQuery(document).ready(function ($) {
data: e.target.result,
processData: false,
beforeSend(xhr) {
turn_on_spinner('#bmltwf-backup-spinner');
clear_notices();
bmltwf_turn_on_spinner('#bmltwf-backup-spinner');
bmltwf_clear_notices();
xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})
.done(function (response) {
turn_off_spinner('#bmltwf-backup-spinner');
notice_success(response, 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-backup-spinner');
bmltwf_notice_success(response, 'bmltwf-error-message');
})
.fail(function (xhr) {
notice_error(xhr, 'bmltwf-error-message');
turn_off_spinner('#bmltwf-backup-spinner');
bmltwf_notice_error(xhr, 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-backup-spinner');
});
};

Expand Down Expand Up @@ -174,7 +174,7 @@ jQuery(document).ready(function ($) {

// click handler for bmlt configuration popup
$('#bmltwf_configure_bmlt_server').on('click', function () {
clear_notices();
bmltwf_clear_notices();

hide_bmlt_validation();

Expand All @@ -189,7 +189,7 @@ jQuery(document).ready(function ($) {
dataType: 'json',
contentType: 'application/json',
beforeSend(xhr) {
// clear_notices();
// bmltwf_clear_notices();
xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})
Expand Down Expand Up @@ -234,14 +234,14 @@ jQuery(document).ready(function ($) {
dataType: 'json',
processData: false,
beforeSend(xhr) {
turn_on_spinner('#bmltwf-backup-spinner');
clear_notices();
bmltwf_turn_on_spinner('#bmltwf-backup-spinner');
bmltwf_clear_notices();
xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})
.done(function (response) {
turn_off_spinner('#bmltwf-backup-spinner');
notice_success(response, 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-backup-spinner');
bmltwf_notice_success(response, 'bmltwf-error-message');
const blob = new Blob([response.backup], { type: 'application/json' });
const link = document.createElement('a');
const b_elem = document.getElementById('bmltwf_backup_filename');
Expand All @@ -262,8 +262,8 @@ jQuery(document).ready(function ($) {
link.click();
})
.fail(function (xhr) {
notice_error(xhr, 'bmltwf-error-message');
turn_off_spinner('#bmltwf-backup-spinner');
bmltwf_notice_error(xhr, 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-backup-spinner');
});
});

Expand Down Expand Up @@ -293,16 +293,16 @@ jQuery(document).ready(function ($) {
contentType: 'application/json',
data: JSON.stringify(parameters),
beforeSend(xhr) {
clear_notices();
bmltwf_clear_notices();
xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})
.done(function (response) {
notice_success(response, 'bmltwf-error-message');
bmltwf_notice_success(response, 'bmltwf-error-message');
update_from_test_result(response);
})
.fail(function (xhr) {
notice_error(xhr, 'bmltwf-error-message');
bmltwf_notice_error(xhr, 'bmltwf-error-message');
update_from_test_result(xhr.responseJSON.data);
});
}
Expand All @@ -321,16 +321,16 @@ jQuery(document).ready(function ($) {
contentType: 'application/json',
data: JSON.stringify(parameters),
beforeSend(xhr) {
clear_notices();
bmltwf_clear_notices();
xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})
.done(function (response) {
notice_success(response, 'options_dialog_bmltwf_error_message');
bmltwf_notice_success(response, 'options_dialog_bmltwf_error_message');
resolve();
})
.fail(function (xhr) {
notice_error(xhr, 'options_dialog_bmltwf_error_message');
bmltwf_notice_error(xhr, 'options_dialog_bmltwf_error_message');
reject();
});
});
Expand Down Expand Up @@ -361,13 +361,13 @@ jQuery(document).ready(function ($) {
contentType: 'application/json',
data: JSON.stringify(parameters),
beforeSend(xhr) {
clear_notices();
bmltwf_clear_notices();
xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})

.done(function (response) {
notice_success(response, 'options_dialog_bmltwf_error_message');
bmltwf_notice_success(response, 'options_dialog_bmltwf_error_message');
$('#bmltwf_bmlt_server_address_test_yes').show();
$('#bmltwf_bmlt_login_test_yes').show();
$('#bmltwf_bmlt_server_address_test_no').hide();
Expand Down Expand Up @@ -397,7 +397,7 @@ jQuery(document).ready(function ($) {
}
enable_save_button(false);

notice_error(xhr, 'options_dialog_bmltwf_error_message');
bmltwf_notice_error(xhr, 'options_dialog_bmltwf_error_message');
});
}

Expand Down
26 changes: 13 additions & 13 deletions js/admin_service_bodies.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/* eslint no-undef: "error" */

/* global wp, jQuery */
/* global clear_notices, turn_on_spinner, turn_off_spinner, notice_success, notice_error */
/* global bmltwf_clear_notices, bmltwf_turn_on_spinner, bmltwf_turn_off_spinner, bmltwf_notice_success, bmltwf_notice_error */
/* global bmltwf_admin_bmltwf_service_bodies_rest_url */
/* global wp_users_url */

Expand Down Expand Up @@ -67,7 +67,7 @@ jQuery(document).ready(function ($) {
});
const post = create_service_area_permission_post();

clear_notices();
bmltwf_clear_notices();

$.ajax({
url: bmltwf_admin_bmltwf_service_bodies_rest_url,
Expand All @@ -77,18 +77,18 @@ jQuery(document).ready(function ($) {
dataType: 'json',
processData: false,
beforeSend(xhr) {
turn_on_spinner('#bmltwf-submit-spinner');
bmltwf_turn_on_spinner('#bmltwf-submit-spinner');

xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})
.done(function (response) {
turn_off_spinner('#bmltwf-submit-spinner');
notice_success(response, 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-submit-spinner');
bmltwf_notice_success(response, 'bmltwf-error-message');
})
.fail(function (xhr) {
turn_off_spinner('#bmltwf-submit-spinner');
notice_error(xhr, 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-submit-spinner');
bmltwf_notice_error(xhr, 'bmltwf-error-message');
});
});

Expand All @@ -100,7 +100,7 @@ jQuery(document).ready(function ($) {
dataType: 'json',
data: parameters,
beforeSend(xhr) {
turn_on_spinner('#bmltwf-form-spinner');
bmltwf_turn_on_spinner('#bmltwf-form-spinner');
xhr.setRequestHeader('X-WP-Nonce', $('#_wprestnonce').val());
},
})
Expand Down Expand Up @@ -171,19 +171,19 @@ jQuery(document).ready(function ($) {
$('.grow-wrap textarea').trigger('input');

// turn off spinner
turn_off_spinner('#bmltwf-form-spinner');
bmltwf_turn_off_spinner('#bmltwf-form-spinner');
// turn on table
$('#bmltwf-userlist-table').show();
$('#bmltwf_submit').show();
});
} else {
turn_off_spinner('#bmltwf-form-spinner');
notice_error(__('Error retrieving wordpress users', 'bmlt-workflow'), 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-form-spinner');
bmltwf_notice_error(__('Error retrieving wordpress users', 'bmlt-workflow'), 'bmltwf-error-message');
}
});
})
.fail(function (xhr) {
turn_off_spinner('#bmltwf-form-spinner');
notice_error(xhr, 'bmltwf-error-message');
bmltwf_turn_off_spinner('#bmltwf-form-spinner');
bmltwf_notice_error(xhr, 'bmltwf-error-message');
});
});
Loading

0 comments on commit 362dc45

Please sign in to comment.