Skip to content

Commit

Permalink
Removed any extra miqSparkle On/Off calls from jquery requests.
Browse files Browse the repository at this point in the history 
- Removed any extra miqSparkle On/Off calls from jquery requests that were added in this ManageIQ#1225 PR.
- Added code back to turn spinner on/off if it was set in the check_box_tag

ManageIQ#1150
  • Loading branch information
@h-kataria
h-kataria committed Jan 14, 2015
1 parent 60baad5 commit 6a055e5
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 18 deletions.
20 changes: 14 additions & 6 deletions vmdb/app/assets/javascripts/cfme_application.js
View file
Expand Up @@ -800,7 +800,7 @@ function miqDropComplete(event, ui) {
var url = "/" + miq_widget_dd_url + "?" + el.sortable('serialize', {key:el.attr('id') + "[]"}).toString();
//Adding id of record being edited to be used by load_edit call
if(typeof miq_record_id != "undefined") url += "&id=" + miq_record_id
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url);
}

// Attach a calendar control to all text boxes that start with miq_date_
Expand Down Expand Up @@ -1013,11 +1013,19 @@ function miqObserveCheckboxes() {
var el = $j(this);
el.unbind('change')
el.change(function() {
miqJqueryRequest(url, {beforeSend: true,
complete: true,
data:el.attr('id') + '=' + encodeURIComponent(el.prop('checked') ? 1 : null),
no_encoding: true
});
if (el.attr('data-miq_sparkle_on')){
miqJqueryRequest(url, {
beforeSend: true,
complete: true,
data: el.attr('id') + '=' + encodeURIComponent(el.prop('checked') ? 1 : null),
no_encoding: true
});
} else {
miqJqueryRequest(url, {
data: el.attr('id') + '=' + encodeURIComponent(el.prop('checked') ? 1 : null),
no_encoding: true
});
}

This comment has been minimized.

Sign in to view

Copy link
@martinpovolny

martinpovolny Jan 14, 2015

I would prefer:

var options = {
  data: el.attr('id') + '=' + encodeURIComponent(el.prop('checked') ? 1 : null),
  no_encoding: true
};
if (el.attr('data-miq_sparkle_on')){
  options['compete'] = ....
 ...
}
miqJqueryRequest(url, options);

Also: have you researched, that when there's on, than there's also off? I mean, don't those two to be tested and set separately?
})
})
}
Expand Down
20 changes: 10 additions & 10 deletions vmdb/app/assets/javascripts/cfme_dynatree.js
View file
Expand Up @@ -7,7 +7,7 @@ function cfmeOnClick_RoleFeatureCheck(node) {
else
var checked = '1';
var url = check_url + node.data.key + '?check=' + checked
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url);
}

// Expand/collapse all children on double click
Expand Down Expand Up @@ -45,7 +45,7 @@ function cfmeOnLazyRead_GetNodeChildren(node, tree, controller) {
//need to bind hover event to lazy loaded nodes
cfme_bind_hover_event(tree)
var url = '/' + controller + '/tree_autoload_quads?id=' + node.data.key
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url, {beforeSend: true});
}
}
});
Expand Down Expand Up @@ -77,7 +77,7 @@ function cfme_bind_hover_event(tree_name) {
function cfmeOnClick_SelectTreeNode(id) {
rec_id = id.split('__')
var url = '/' + miq_controller + '/tree_select/?id=' + rec_id[0];
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url, {beforeSend: true});
}

function cfmeOnClick_SelectDlgEditTreeNode(id) {
Expand Down Expand Up @@ -111,7 +111,7 @@ function miqOnClick_ProvLdapOus(id) {
node.expand();
node._activate(false, true);
if (id.split('_-_').length > 1) {
miqJqueryRequest(click_url + '?ou_id=' + id, {beforeSend: true, complete: true});
miqJqueryRequest(click_url + '?ou_id=' + id);
return true;
}
}
Expand Down Expand Up @@ -184,7 +184,7 @@ function cfmeOnClick_SelectOptimizeTreeNode(id) {
rep_id = id.split('__')
cfmeDynatree_activateNodeSilently(tree, rep_id)
var url = "/miq_capacity/optimize_tree_select/?id=" + rep_id[0]
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url, {beforeSend: true});
}
}

Expand All @@ -204,7 +204,7 @@ function cfme_dynatree_toggle_expand(treename, expand_mode){
function miqOnCheck_Protect(node, treename) {
ppid = node.data.key.split('_').pop();
var url = check_url + ppid + '?check=' + (node.isSelected() ? '0' : '1')
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url);
return true;
}

Expand Down Expand Up @@ -275,7 +275,7 @@ function cfmeOnClick_TimelineSelection(id) {
// OnCheck handler for the belongs to drift/compare sections tree
function miqOnCheck_Sections(tree_name, key, checked, all_checked) {
var url = check_url + '?id=' + key + '&check=' + checked + '&all_checked=' + all_checked
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url);
return true;
}

Expand All @@ -292,7 +292,7 @@ function cfmeOnClick_SmartProxyAffinityCheck(node) {
var checked = '0'; // If node was selected, now unchecking
else
var checked = '1';
miqJqueryRequest(check_url + node.data.key + '?check=' + checked, {beforeSend: true, complete: true});
miqJqueryRequest(check_url + node.data.key + '?check=' + checked);
}

// OnClick handler for Genealogy Tree
Expand Down Expand Up @@ -349,7 +349,7 @@ function cfmeCheckAll(cb, treename) {

if (count > 0) {
var url = check_url + '?check_all=' + cb.checked + '&all_checked=' + selectedKeys
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url);
}
return true;
}
Expand Down Expand Up @@ -411,7 +411,7 @@ function miqCheck_CU_All(cb, treename) {
// OnCheck handler for the C&U collection trees
function miqOnCheck_CU_Filters(tree_name, key, checked) {
var url = check_url + '?id=' + key +'&check=' + checked + '&tree_name=' + tree_name;
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url);
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion vmdb/app/assets/javascripts/miq_dhtmlxgrid.js
View file
Expand Up @@ -233,7 +233,7 @@ function miqResizeColEnd(grid_obj) {
if (miq_grid_col_widths != grid_obj.cellWidthPX.join(",")) {
miq_grid_col_widths = grid_obj.cellWidthPX.join(",");
var url = '/' + miq_controller + '/save_col_widths/?col_widths=' + miq_grid_col_widths
miqJqueryRequest(url, {beforeSend: true, complete: true});
miqJqueryRequest(url);
} } }

// Order a service from the catalog list view
Expand Down
2 changes: 1 addition & 1 deletion vmdb/app/assets/javascripts/miq_ujs_bindings.js
View file
Expand Up @@ -49,7 +49,7 @@ $j(document).ready(function(){
el.observe_field(interval, function(){
var oneTrans = this.getAttribute('data-miq_send_one_trans'); // Grab one trans URL, if present
if (typeof submit != "undefined"){ // If submit element passed in
miqJqueryRequest(url, {beforeSend: true, complete: true, data: Form.serialize(submit)});
miqJqueryRequest(url, {data: Form.serialize(submit)});
} else if (oneTrans) {
miqSendOneTrans(url);
} else {
Expand Down

0 comments on commit 6a055e5

Please sign in to comment.