Commit dc236b50 by Torkel Ödegaard

refatoring: minor changes to PR #13149

parent 777010b2
......@@ -130,9 +130,8 @@ export class SearchCtrl {
}
const max = flattenedResult.length;
let newIndex = this.selectedIndex + direction;
const something = (newIndex %= max);
this.selectedIndex = something < 0 ? newIndex + max : newIndex;
const newIndex = (this.selectedIndex + direction) % max;
this.selectedIndex = newIndex < 0 ? newIndex + max : newIndex;
const selectedItem = flattenedResult[this.selectedIndex];
if (selectedItem.dashboardIndex === undefined && this.results[selectedItem.folderIndex].id === 0) {
......
import _ from 'lodash';
import config from 'app/core/config';
import locationUtil from 'app/core/utils/location_util';
export class DashboardImportCtrl {
navModel: any;
......@@ -179,7 +180,8 @@ export class DashboardImportCtrl {
folderId: this.folderId,
})
.then(res => {
this.$location.url(res.importedUrl);
const dashUrl = locationUtil.stripBaseFromUrl(res.importedUrl);
this.$location.url(dashUrl);
});
}
......
......@@ -37,12 +37,14 @@ function uploadDashboardDirective(timer, alertSrv, $location) {
};
let i = 0;
let f = files[i];
for (i; f; i++) {
let file = files[i];
while (file) {
const reader = new FileReader();
reader.onload = readerOnload();
reader.readAsText(f);
f = files[i];
reader.readAsText(file);
i += 1;
file = files[i];
}
}
......
......@@ -192,6 +192,10 @@
&:hover,
&.selected {
background: $list-item-hover-bg;
.search-item__body-title {
color: $text-color-strong;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment