Skip to content

Commit

Permalink
Merge pull request #3288 from martinpovolny/tasks_infinispinner
Browse files Browse the repository at this point in the history
GTL: do not sparkle unless we are going to navigate.
  • Loading branch information
h-kataria authored Jan 19, 2018
2 parents 103aeb7 + 0291aa4 commit 995933a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion app/assets/javascripts/controllers/report_data_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,13 @@
event.stopPropagation();
event.preventDefault();
if (this.initObject.showUrl) {
miqSparkleOn();
var prefix = this.initObject.showUrl;
var splitUrl = this.initObject.showUrl.split('/');
if (item.parent_path && item.parent_id) {
miqSparkleOn();
this.$window.DoNav(item.parent_path + '/' + item.parent_id);
} else if (this.initObject.isExplorer && isCurrentControllerOrPolicies(splitUrl)) {
miqSparkleOn();
var itemId = item.id;
if (_.isString(this.initObject.showUrl) && this.initObject.showUrl.indexOf('?id=') !== -1) {
itemId = constructSuffixForTreeUrl(this.initObject, item);
Expand All @@ -222,6 +223,7 @@
this.setExtraClasses();
}.bind(this));
} else if (prefix !== "true") {
miqSparkleOn();
var lastChar = prefix[prefix.length - 1];
prefix = (lastChar !== '/' && lastChar !== '=') ? prefix + '/' : prefix;
this.$window.DoNav(prefix + (item.long_id || item.id));
Expand Down

0 comments on commit 995933a

Please sign in to comment.