scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix JS errors on text results creation/editing [SCI-9140] (#6086)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-08-28 14:53:09 +02:00 committed by GitHub
parent 953bd234f4
commit 165b7febcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/my_modules/results.js
View file

@ -148,7 +148,7 @@
.removeClass(GLOBAL_CONSTANTS.HAS_UNSAVED_DATA_CLASS_NAME);
break;
case ResultTypeEnum.TEXT:
textWithoutImages = TinyMCE.getContent().replaceAll(/src="(data:image\/[^;]+;base64[^"]+)"/i, '');
textWithoutImages = TinyMCE.getContent().replaceAll(/src="(data:image\/[^;]+;base64[^"]+)"/g, '');
textValidator(
ev, $form.find('#result_text_attributes_textarea'), 1,

8
app/assets/javascripts/results/result_texts.js
View file

@ -40,6 +40,12 @@
});
}
function initSaveReslutText() {
$('#results').on('click', '.edit-text-result .save-result', (event) => {
Results.processResult(event, Results.ResultTypeEnum.TEXT);
});
}
// Edit result text button behaviour
function applyEditResultTextCallback() {
$('.edit-result-text').off('ajax:success ajax:error').on('ajax:success', function(e, data) {
@ -101,6 +107,7 @@
publicAPI = Object.freeze({
initNewReslutText: initNewReslutText,
initSaveReslutText: initSaveReslutText,
applyEditResultTextCallback: applyEditResultTextCallback
});
@ -108,5 +115,6 @@
}());
ResultText.initNewReslutText();
ResultText.initSaveReslutText();
ResultText.applyEditResultTextCallback();
}());

7
app/assets/javascripts/results/result_texts/edit.js
View file

@ -1,7 +0,0 @@
/* global Results */
(function() {
$('.edit-result-texts-buttons').on('click', '.save-result', (event) => {
Results.processResult(event, Results.ResultTypeEnum.TEXT);
});
}());

7
app/assets/javascripts/results/result_texts/new.js
View file

@ -1,7 +0,0 @@
/* global Results */
(function() {
$('.new-result-texts-buttons').on('click', '.save-result', (event) => {
Results.processResult(event, Results.ResultTypeEnum.TEXT);
});
}());

15
app/assets/javascripts/sitewide/comments.js
View file

@ -87,14 +87,13 @@ var Comments = (function() {
$el.find('.new-comment-button').removeClass('show');
newButton.disable = false;
$el.find('textarea').focus().blur();
})
.error((error) => {
if (error.status === 403) {
HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger');
}
errorField.text(error.responseJSON.errors.message);
newButton.disable = false;
});
}).fail((error) => {
if (error.status === 403) {
HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger');
}
errorField.text(error.responseJSON.errors.message);
newButton.disable = false;
});
});
});
}

1
app/views/result_texts/_edit.html.erb
View file

@ -21,7 +21,6 @@
</button>
<%= f.button t("general.save"),
class: 'btn btn-primary save-result' %>
<%= javascript_include_tag 'results/result_texts/edit' %>
</div>
<% end %>
</div>

1
app/views/result_texts/_new.html.erb
View file

@ -20,7 +20,6 @@
</button>
<%= f.button t("result_texts.new.create"),
class: 'btn btn-primary save-result' %>
<%= javascript_include_tag 'results/result_texts/new' %>
</div>
<% end %>
</div>

2
config/initializers/assets.rb
View file

@ -106,8 +106,6 @@ Rails.application.config.assets.precompile += %w(users/registrations/new_with_pr
Rails.application.config.assets.precompile += %w(team_zip_exports/load_handson.js)
Rails.application.config.assets.precompile += %w(repository_columns/manage_column_partials/number.js)
Rails.application.config.assets.precompile += %w(repository_columns/manage_column_partials/stock.js)
Rails.application.config.assets.precompile += %w(results/result_texts/new.js)
Rails.application.config.assets.precompile += %w(results/result_texts/edit.js)
Rails.application.config.assets.precompile += %w(shared/file_preview.js)
Rails.application.config.assets.precompile += %w(users/shared/linkedin_sign_in_links.js)
Rails.application.config.assets.precompile += %w(reports/template_helpers.js)