Skip to content

Commit

Permalink
Client format
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Jun 11, 2018
1 parent c78d7ef commit 544cc61
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 13 deletions.
4 changes: 3 additions & 1 deletion client/galaxy/scripts/components/HistoryImport.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ export default {
axios
.post(`${Galaxy.root}api/histories`, formData)
.then(response => {
window.location = `${Galaxy.root}histories/list?message=${response.data.message}&status=success`;
window.location = `${Galaxy.root}histories/list?message=${
response.data.message
}&status=success`;
})
.catch(response => {
let message = response.responseJSON && response.responseJSON.err_msg;
Expand Down
2 changes: 1 addition & 1 deletion client/galaxy/scripts/components/RuleCollectionBuilder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,7 @@ export default {
.post(`${Galaxy.root}api/tools/fetch`, {
history_id: historyId,
targets: targets,
auto_decompress: true,
auto_decompress: true
})
.then(this.refreshAndWait)
.catch(this.renderFetchError);
Expand Down
8 changes: 6 additions & 2 deletions client/galaxy/scripts/mvc/dataset/dataset-li.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,12 @@ DatasetListItemView.prototype.templates = (() => {
"dataset"
);
summaryTemplates[STATES.PAUSED] = BASE_MVC.wrapTemplate(
["<div>", _l('This job is paused. Use the "Resume Paused Jobs" in the history menu to resume'), "</div>",
'<div class="info"><%- dataset.misc_info %></div>'],
[
"<div>",
_l('This job is paused. Use the "Resume Paused Jobs" in the history menu to resume'),
"</div>",
'<div class="info"><%- dataset.misc_info %></div>'
],
"dataset"
);
summaryTemplates[STATES.ERROR] = BASE_MVC.wrapTemplate(
Expand Down
6 changes: 5 additions & 1 deletion client/galaxy/scripts/mvc/history/job-states-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ var JobStatesSummaryCollection = Backbone.Collection.extend({
});
} else {
this.on({
add: model => { if(!this.active) { model.fetch() } }
add: model => {
if (!this.active) {
model.fetch();
}
}
});
}

Expand Down
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/ui/ui-misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export var TextSelect = Backbone.View.extend({
this.textmode = input_def.textable && (!$.isArray(data) || data.length === 0);
this.text.$el[this.textmode ? "show" : "hide"]();
this.select.$el[this.textmode ? "hide" : "show"]();
this.select.update({data: data});
this.select.update({ data: data });
this.value(v);
}
});
Expand Down
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/ui/ui-select-library.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var View = Backbone.View.extend({
label: model.get("name")
});
});
self.library_select.update({data: data});
self.library_select.update({ data: data });
});

// add reset handler for fetched library datasets
Expand All @@ -79,7 +79,7 @@ var View = Backbone.View.extend({
}
});
}
self.dataset_list.update({data: data});
self.dataset_list.update({ data: data });
});

// add change event. fires on trigger
Expand Down
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/workflow/workflow-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export default Backbone.View.extend({

// Clear search by clicking X button
$("#search-clear-btn").click(function() {
$("#tool-search-query").val('');
$("#tool-search-query").val("");
reset_tool_search(false);
});

Expand All @@ -148,7 +148,7 @@ export default Backbone.View.extend({
.keyup(function(e) {
// If ESC is pressed clear the search field
if (e.keyCode == 27) {
this.value='';
this.value = "";
}
// Remove italics.
$(this).css("font-style", "normal");
Expand Down
4 changes: 2 additions & 2 deletions client/galaxy/style/scss/history.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
.annotation {
background: white;
border-radius: 3px;
border: 1px solid fade-out($layout-border-color, .5);
border: 1px solid fade-out($layout-border-color, 0.5);
padding: 4px;
white-space: pre-wrap;
overflow: auto;
Expand Down Expand Up @@ -321,7 +321,7 @@

// show clickable for expansion
cursor: pointer;
border-bottom: 1px solid rgba(grey, .5);
border-bottom: 1px solid rgba(grey, 0.5);
& > * {
display: table-cell;
vertical-align: top;
Expand Down
2 changes: 1 addition & 1 deletion client/galaxy/style/scss/list-item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $vertical-gap: 8px;
padding-top: 4px;
}
[class$="messagesmall"] {
margin: $spacing-top $spacing-right ( $spacing-bottom - 4 ) $spacing-left;
margin: $spacing-top $spacing-right ($spacing-bottom - 4) $spacing-left;
font-size: 90%;
&:first-child {
margin-top: 0px;
Expand Down

0 comments on commit 544cc61

Please sign in to comment.