mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-12-11 14:45:59 +08:00
Move result asset new and edit event handler to result asset and delete files [SCI-9058]
This commit is contained in:
parent
ad65de20ce
commit
ebcb784149
6 changed files with 23 additions and 26 deletions
|
|
@ -2,6 +2,20 @@
|
|||
'use strict';
|
||||
|
||||
global.ResultAssets = (function() {
|
||||
// New asset callback
|
||||
function createResultAssetCallback() {
|
||||
$('.new-result-assets-buttons')
|
||||
.on('click', '.save-result', (event) => {
|
||||
DragNDropResults.processResult(event); // eslint-disable-line no-undef
|
||||
})
|
||||
.on('click', '.cancel-new', () => {
|
||||
DragNDropResults.destroyAll(); // eslint-disable-line no-undef
|
||||
});
|
||||
|
||||
$('#new-result-assets-select').on('change', '#drag-n-drop-assets', function() {
|
||||
DragNDropResults.init(this.files); // eslint-disable-line no-undef
|
||||
});
|
||||
}
|
||||
// New result asset behaviour
|
||||
function initNewResultAsset() {
|
||||
$('#new-result-asset').on('click', function(event) {
|
||||
|
|
@ -24,6 +38,7 @@
|
|||
Results.initCancelFormButton($form, initNewResultAsset);
|
||||
Results.toggleResultEditButtons(false);
|
||||
dragNdropAssetsInit();
|
||||
createResultAssetCallback();
|
||||
},
|
||||
error: function(xhr, status, e) {
|
||||
$(this).renderFormErrors('result', xhr.responseJSON, true, e);
|
||||
|
|
@ -34,6 +49,13 @@
|
|||
});
|
||||
}
|
||||
|
||||
// Save asset callback
|
||||
function saveResultAssetCallback() {
|
||||
$('.edit-result-assets-buttons').on('click', '.save-result', (event) => {
|
||||
Results.processResult(event, Results.ResultTypeEnum.FILE); // eslint-disable-line no-undef
|
||||
});
|
||||
}
|
||||
|
||||
function applyEditResultAssetCallback() {
|
||||
$('.edit-result-asset').off('ajax:success ajax:error').on('ajax:success', function(e, data) {
|
||||
var $result = $(this).closest('.result');
|
||||
|
|
@ -55,6 +77,7 @@
|
|||
Results.toggleResultEditButtons(false);
|
||||
|
||||
$('#result_name').focus();
|
||||
saveResultAssetCallback();
|
||||
}).on('ajax:error', function(e, xhr, status, error) {
|
||||
animateSpinner(null, false);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
/* global Results */
|
||||
|
||||
(function() {
|
||||
$('.edit-result-assets-buttons').on('click', '.save-result', (event) => {
|
||||
Results.processResult(event, Results.ResultTypeEnum.FILE);
|
||||
});
|
||||
}());
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
/* global DragNDropResults */
|
||||
|
||||
(function() {
|
||||
$('.new-result-assets-buttons')
|
||||
.on('click', '.save-result', (event) => {
|
||||
DragNDropResults.processResult(event);
|
||||
})
|
||||
.on('click', '.cancel-new', () => {
|
||||
DragNDropResults.destroyAll();
|
||||
});
|
||||
|
||||
$('#new-result-assets-select').on('change', '#drag-n-drop-assets', function() {
|
||||
DragNDropResults.init(this.files);
|
||||
});
|
||||
}());
|
||||
|
|
@ -18,5 +18,4 @@
|
|||
class: 'btn btn-primary save-result' %>
|
||||
</div>
|
||||
<% end %>
|
||||
<%= javascript_include_tag 'results/result_assets/edit', nonce: true %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,5 +27,4 @@
|
|||
|
||||
</div>
|
||||
<% end %>
|
||||
<%= javascript_include_tag 'results/result_assets/new', nonce: true %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -108,8 +108,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_assets/new.js)
|
||||
Rails.application.config.assets.precompile += %w(results/result_assets/edit.js)
|
||||
Rails.application.config.assets.precompile += %w(results/result_tables/new.js)
|
||||
Rails.application.config.assets.precompile += %w(results/result_tables/edit.js)
|
||||
Rails.application.config.assets.precompile += %w(results/result_texts/new.js)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue