Skip to content

Commit

Permalink
Merge pull request #7519 from himdel/dialog-field-refresh
Browse files Browse the repository at this point in the history
dialog_field_refresh - drop unused code
  • Loading branch information
h-kataria authored Nov 19, 2020
2 parents 8192895 + 7e57525 commit 9d77915
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 2,033 deletions.
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
//= require ./miq_qe
//= require ./git_import
//= require ./automate_import_export
//= require ./dialog_field_refresh
//= require ./miq_c3_config
//= require ./miq_ujs_bindings
//= require ./miq_tree
Expand Down
293 changes: 0 additions & 293 deletions app/assets/javascripts/dialog_field_refresh.js

This file was deleted.

9 changes: 1 addition & 8 deletions app/assets/javascripts/miq_application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* global add_flash dialogFieldRefresh getChartColumnDataValues getChartFormatedValue miqBrowserDetect miqExpressionPrefill miqFlashLater miqFlashSaved miqGridCheckAll miqGridGetCheckedRows miqLoadTL miqMenu miqTreeObject miqValueStylePrefill performFiltering recalculateChartYAxisLabels */
/* global add_flash getChartColumnDataValues getChartFormatedValue miqBrowserDetect miqExpressionPrefill miqFlashLater miqFlashSaved miqGridCheckAll miqGridGetCheckedRows miqMenu miqTreeObject miqValueStylePrefill recalculateChartYAxisLabels */

// MIQ specific JS functions

Expand Down Expand Up @@ -853,16 +853,9 @@ function miqSendDateRequest(el) {
// tack on the id and value to the URL
var urlstring = url + '?' + el.prop('id') + '=' + el.val();

var attemptAutoRefreshTrigger = function() {
if (parms.auto_refresh === true) {
dialogFieldRefresh.triggerAutoRefresh(parms);
}
};

var options = {
beforeSend: !!el.attr('data-miq_sparkle_on'),
complete: !!el.attr('data-miq_sparkle_off'),
done: attemptAutoRefreshTrigger,
};

return miqObserveRequest(urlstring, options);
Expand Down
17 changes: 1 addition & 16 deletions app/assets/javascripts/miq_ujs_bindings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* global dialogFieldRefresh miqCheckForChanges miqCheckMaxLength miqJqueryRequest miqMenuChangeRow miqObserveRequest miqSendDateRequest miqSendOneTrans miqSerializeForm miqSparkle miqSparkleOn */
/* global miqCheckForChanges miqCheckMaxLength miqJqueryRequest miqMenuChangeRow miqObserveRequest miqSendDateRequest miqSendOneTrans miqSerializeForm miqSparkle miqSparkleOn */

// MIQ unobtrusive javascript bindings run when document is fully loaded

Expand Down Expand Up @@ -65,15 +65,6 @@ $(document).ready(function() {
$(this).data('params', miqSerializeForm(form_id));
});

// Bind in the observe support. If interval is configured, use the observe_field function
var attemptAutoRefreshTrigger = function(parms) {
return function() {
if (parms.auto_refresh === true) {
dialogFieldRefresh.triggerAutoRefresh(parms);
}
};
};

var observeWithInterval = function(el, parms) {
if (el.data('isObserved')) {
return;
Expand All @@ -90,20 +81,17 @@ $(document).ready(function() {
// If submit element passed in
miqObserveRequest(url, {
data: miqSerializeForm(submit),
done: attemptAutoRefreshTrigger(parms),
});
} else if (oneTrans) {
miqSendOneTrans(url, {
observe: true,
done: attemptAutoRefreshTrigger(parms),
});
} else {
// tack on the id and value to the URL
var data = {};
data[el.attr('id')] = el.prop('value');

miqObserveRequest(url, {
done: attemptAutoRefreshTrigger(parms),
data: data,
});
}
Expand All @@ -125,7 +113,6 @@ $(document).ready(function() {
data: id + '=' + value,
beforeSend: !!el.attr('data-miq_sparkle_on'),
complete: !!el.attr('data-miq_sparkle_off'),
done: attemptAutoRefreshTrigger(parms),
});
}, 700, {leading: true, trailing: true}));
};
Expand Down Expand Up @@ -153,7 +140,6 @@ $(document).ready(function() {
data: id + '=' + value,
beforeSend: !!el.attr('data-miq_sparkle_on'),
complete: !!el.attr('data-miq_sparkle_off'),
done: attemptAutoRefreshTrigger(parms),
});
});

Expand All @@ -170,7 +156,6 @@ $(document).ready(function() {
data: id + '=' + value,
beforeSend: !!el.attr('data-miq_sparkle_on'),
complete: !!el.attr('data-miq_sparkle_off'),
done: attemptAutoRefreshTrigger(parms),
});

event.stopPropagation();
Expand Down
Loading

0 comments on commit 9d77915

Please sign in to comment.