Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors:
given-names: Justin
- family-names: Tresova
given-names: Armand
version: 1.10.0
version: 1.11.0
doi: 10.5281/zenodo.1171250
date-released: 2017-05-08
url: "https://github.com/XjSv/cooked"
6 changes: 4 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
Versions that are currently being supported with security updates.

| Version | Supported |
| ------- | ------------------ |
| 1.9.4 | :white_check_mark: |
| ----------- | ------------------ |
| 1.11.0 | :white_check_mark: |
| 1.10.0 | :x: |
| 1.9.4 | :x: |
| 1.9.3 | :x: |
| 1.9.2 | :x: |
| 1.9.1 | :x: |
Expand Down
36 changes: 18 additions & 18 deletions assets/admin/js/cooked-functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ var $_CookedConditionalTimeout = false;
cooked_save_default_nonce = thisButton.data('nonce'),
cooked_save_default_bulk_nonce = thisButton.data('bulk-nonce'),
thisContainer = thisButton.parent(),
confirm_save = confirm(cooked_js_vars.i18n_confirm_save_default_all),
confirm_save = confirm(cooked_functions_js_vars.i18n_confirm_save_default_all),
recipe_editor_textarea = $( "#_recipe_settings_content" ),
recipe_editor = tinymce.get('_recipe_settings_content');

Expand All @@ -104,15 +104,15 @@ var $_CookedConditionalTimeout = false;
thisContainer.find('.button, .button-primary').addClass('disabled');

var ajax__save_default_new = $.post(
cooked_js_vars.ajax_url,
cooked_functions_js_vars.ajax_url,
{
action: 'cooked_save_default',
'default_content': recipe_editor_content,
nonce: cooked_save_default_nonce
},
function(result) {
var ajax__save_default_all = $.post(
cooked_js_vars.ajax_url,
cooked_functions_js_vars.ajax_url,
{
action: 'cooked_get_recipe_ids',
nonce: cooked_save_default_bulk_nonce
Expand Down Expand Up @@ -152,14 +152,14 @@ var $_CookedConditionalTimeout = false;
if (!thisButton.hasClass('disabled')) {
thisContainer.find('.button, .button-primary').addClass('disabled');
var ajax__save_default_new = $.post(
cooked_js_vars.ajax_url,
cooked_functions_js_vars.ajax_url,
{
action: 'cooked_save_default',
'default_content': recipe_editor_content,
nonce: nonce
},
function(result) {
thisButton.text( cooked_js_vars.i18n_saved );
thisButton.text( cooked_functions_js_vars.i18n_saved );
thisContainer.find('.button-primary').removeClass('disabled');
}
).fail(function(result) {
Expand All @@ -175,14 +175,14 @@ var $_CookedConditionalTimeout = false;

var thisButton = $(this),
thisContainer = thisButton.parent(),
confirm_load = confirm( cooked_js_vars.i18n_confirm_load_default ),
confirm_load = confirm( cooked_functions_js_vars.i18n_confirm_load_default ),
recipe_editor_textarea = $( "#_recipe_settings_content" ),
recipe_editor = tinymce.get('_recipe_settings_content');

if (confirm_load && !thisButton.hasClass('disabled')) {
thisContainer.find('.button, .button-primary').addClass('disabled');
var ajax__save_default_all = $.post(
cooked_js_vars.ajax_url,
cooked_functions_js_vars.ajax_url,
{
action: 'cooked_load_default'
},
Expand Down Expand Up @@ -537,8 +537,8 @@ var $_CookedConditionalTimeout = false;

// Sets up the media library frame
direction_image_frame = wp.media.frames.direction_image_frame = wp.media({
title: cooked_js_vars.i18n_image_title,
button: { text: cooked_js_vars.i18n_image_button },
title: cooked_functions_js_vars.i18n_image_title,
button: { text: cooked_functions_js_vars.i18n_image_button },
library: { type: 'image' }
});

Expand All @@ -550,7 +550,7 @@ var $_CookedConditionalTimeout = false;
// Sends the attachment URL to our custom image input field.
$('#direction-'+directionID+'-image-src').attr('src',media_attachment.sizes.thumbnail.url).parent().addClass('cooked-has-image');
$('input[name="_recipe_settings[directions]['+directionID+'][image]"]').val( media_attachment.id );
$('.direction-image-button[data-id="'+directionID+'"]').prop( 'value', cooked_js_vars.i18n_image_change );
$('.direction-image-button[data-id="'+directionID+'"]').prop( 'value', cooked_functions_js_vars.i18n_image_change );
});

// Opens the media library frame.
Expand All @@ -576,8 +576,8 @@ var $_CookedConditionalTimeout = false;

// Sets up the media library frame
gallery_images_frame = wp.media.frames.gallery_images_frame = wp.media({
title: cooked_js_vars.i18n_gallery_image_title,
button: { text: cooked_js_vars.i18n_gallery_image_title },
title: cooked_functions_js_vars.i18n_gallery_image_title,
button: { text: cooked_functions_js_vars.i18n_gallery_image_title },
library: { type: 'image' },
multiple: true
});
Expand Down Expand Up @@ -616,8 +616,8 @@ var $_CookedConditionalTimeout = false;

// Sets up the media library frame
var image_edit_frame = wp.media.frames.gallery_images_frame = wp.media({
title: cooked_js_vars.i18n_edit_image_title,
button: { text: cooked_js_vars.i18n_edit_image_button },
title: cooked_functions_js_vars.i18n_edit_image_title,
button: { text: cooked_functions_js_vars.i18n_edit_image_button },
library: { type: 'image' },
multiple: false
});
Expand Down Expand Up @@ -657,7 +657,7 @@ var $_CookedConditionalTimeout = false;
if ( directionID ) {
$('#direction-'+directionID+'-image-src').parent().removeClass('cooked-has-image').prop('src',false);
$('input[name="_recipe_settings[directions]['+directionID+'][image]"]').val('');
$('.direction-image-button[data-id="'+directionID+'"]').prop( 'value',cooked_js_vars.i18n_image_title );
$('.direction-image-button[data-id="'+directionID+'"]').prop( 'value',cooked_functions_js_vars.i18n_image_title );
} else {
thisButton.parent().remove();
}
Expand Down Expand Up @@ -705,7 +705,7 @@ function cooked_set_default_template(recipe_ids, total_recipes, content, nonce,
}

var ajax__bulk_save_default_template = jQuery.post(
cooked_js_vars.ajax_url,
cooked_functions_js_vars.ajax_url,
{
action: 'cooked_save_default_bulk',
recipe_ids: recipe_ids,
Expand All @@ -724,7 +724,7 @@ function cooked_set_default_template(recipe_ids, total_recipes, content, nonce,
progress_text.text(cooked_recipe_update_counter + " / " + total_recipes);
cooked_set_default_template(new_recipe_ids, total_recipes, content, nonce, instance);
} else {
jQuery('.cooked-save-default-all').text(cooked_js_vars.i18n_applied);
jQuery('.cooked-save-default-all').text(cooked_functions_js_vars.i18n_applied);
progress_bar.css({ "width" : "100%" });
progress.removeClass('cooked-active');
progress_text.removeClass('cooked-active').text("");
Expand Down Expand Up @@ -869,7 +869,7 @@ function cooked_reset_direction_builder() {
var fieldID = 'direction-' + randomKeyForInterval + '-' + directionPartName;
thisField.attr('id', fieldID);

if (directionPartName === 'content' && thisField.is('textarea') && cooked_js_vars.wp_editor_roles_allowed) {
if (directionPartName === 'content' && thisField.is('textarea') && cooked_functions_js_vars.wp_editor_roles_allowed) {
// Init the WordPress Editor.
wp.editor.initialize(fieldID, {
tinymce: {
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/js/cooked-functions.min.js

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions assets/admin/js/cooked-migration.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
e.preventDefault();

var thisButton = $(this),
confirm_migrate = confirm(cooked_js_vars.i18n_confirm_migrate_recipe);
confirm_migrate = confirm(cooked_migration_js_vars.i18n_confirm_migrate_recipe);

if (confirm_migrate && !thisButton.hasClass('disabled')) {
thisButton.addClass('disabled').attr('disabled', true);
thisButton.hide();

var ajax__bulk_migrate_recipes = $.post(
cooked_js_vars.ajax_url,
cooked_migration_js_vars.ajax_url,
{
action: 'cooked_get_migrate_ids'
},
Expand All @@ -46,14 +46,14 @@

var thisButton = $(this),
import_type = thisButton.data('import-type'),
confirm_import = confirm(cooked_js_vars.i18n_confirm_import_recipes);
confirm_import = confirm(cooked_migration_js_vars.i18n_confirm_import_recipes);

if (confirm_import && !thisButton.hasClass('disabled')) {
thisButton.addClass('disabled').attr('disabled', true);
thisButton.hide();

var ajax__bulk_import_recipes = $.post(
cooked_js_vars.ajax_url,
cooked_migration_js_vars.ajax_url,
{
action: 'cooked_get_import_ids',
import_type: import_type
Expand Down Expand Up @@ -137,7 +137,7 @@ function cooked_migrate_recipes(recipe_ids, total_recipes ) {
formattedTotal.toLocaleString();

var ajax__bulk_migrate_recipes = jQuery.post(
cooked_js_vars.ajax_url,
cooked_migration_js_vars.ajax_url,
{
action: 'cooked_migrate_recipes',
recipe_ids: recipe_ids
Expand Down Expand Up @@ -168,9 +168,9 @@ function cooked_migrate_recipes(recipe_ids, total_recipes ) {
estimatedHours = Math.floor(estimatedCompletionTime / 3600);
estimatedMinutes = Math.floor((estimatedCompletionTime / 60) % 60);
if ( estimatedHours >= 1 ){
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedHours + " hrs, " + estimatedMinutes + " mins " + cooked_js_vars.i18n_remaining + "</strong>" );
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedHours + " hrs, " + estimatedMinutes + " mins " + cooked_migration_js_vars.i18n_remaining + "</strong>" );
} else if ( estimatedMinutes >= 1 ){
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedMinutes + " mins " + cooked_js_vars.i18n_remaining + "</strong>" );
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedMinutes + " mins " + cooked_migration_js_vars.i18n_remaining + "</strong>" );
} else {
progress_text.text( formattedComplete + " / " + formattedTotal );
}
Expand Down Expand Up @@ -219,7 +219,7 @@ function cooked_import_recipes(recipe_ids, total_recipes, import_type) {
formattedTotal.toLocaleString();

var ajax__bulk_migrate_recipes = jQuery.post(
cooked_js_vars.ajax_url,
cooked_migration_js_vars.ajax_url,
{
action: 'cooked_import_recipes',
recipe_ids: recipe_ids,
Expand Down Expand Up @@ -251,9 +251,9 @@ function cooked_import_recipes(recipe_ids, total_recipes, import_type) {
estimatedHours = Math.floor(estimatedCompletionTime / 3600);
estimatedMinutes = Math.floor((estimatedCompletionTime / 60) % 60);
if ( estimatedHours >= 1 ){
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedHours + " hrs, " + estimatedMinutes + " mins " + cooked_js_vars.i18n_remaining + "</strong>" );
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedHours + " hrs, " + estimatedMinutes + " mins " + cooked_migration_js_vars.i18n_remaining + "</strong>" );
} else if ( estimatedMinutes >= 1 ){
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedMinutes + " mins " + cooked_js_vars.i18n_remaining + "</strong>" );
progress_text.html( formattedComplete + " / " + formattedTotal + "<strong style='display:inline-block; float:right;'>" + estimatedMinutes + " mins " + cooked_migration_js_vars.i18n_remaining + "</strong>" );
} else {
progress_text.text( formattedComplete + " / " + formattedTotal );
}
Expand Down
Loading
Loading