opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 10:24:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

More (minor) post-merge cleanup

Browse Source
This commit is contained in:
Dannon Baker
2018-04-10 22:28:51 -04:00
parent 674a48cee3
commit 9a36dc3a98
12 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/form/form-parameters.js
+5 -5
View File
@@ -85,10 +85,10 @@ export default Backbone.Model.extend({
// pick selection display
var classes = {
"checkboxes": Ui.Checkbox,
"radio": Ui.Radio,
"radiobutton": Ui.RadioButton
}
checkboxes: Ui.Checkbox,
radio: Ui.Radio,
radiobutton: Ui.RadioButton
};
var SelectClass = classes[input_def.display] || Ui.Select;
var select = new SelectClass.View({
id: `field-${input_def.id}`,
@@ -102,7 +102,7 @@ export default Backbone.Model.extend({
individual: input_def.individual,
searchable: input_def.flavor !== "workflow"
});
return input_def.textable ? new Ui.TextSelect({select: select}) : select;
return input_def.textable ? new Ui.TextSelect({ select: select }) : select;
},
/** Drill down options field */
client/galaxy/scripts/mvc/library/library-dataset-view.js
+3 -3
View File
@@ -99,7 +99,7 @@ var LibraryDatasetView = Backbone.View.extend({
var template = this.templateDataset();
this.$el.html(template({ item: this.model }));
$(".peek").html(this.model.get("peek"));
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
},
fetchVersion: function(options) {
@@ -144,7 +144,7 @@ var LibraryDatasetView = Backbone.View.extend({
file_ext: this.model.get("file_ext")
});
$(".peek").html(this.model.get("peek"));
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
},
downloadDataset: function() {
@@ -302,7 +302,7 @@ var LibraryDatasetView = Backbone.View.extend({
.fail(() => {
mod_toastr.error("An error occurred while attempting to fetch dataset permissions.");
});
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
$("#center").css("overflow", "auto");
},
client/galaxy/scripts/mvc/library/library-folder-view.js
+1 -1
View File
@@ -71,7 +71,7 @@ var FolderView = Backbone.View.extend({
mod_toastr.error("An error occurred while attempting to fetch folder permissions.");
});
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
//hack to show scrollbars
$("#center").css("overflow", "auto");
},
client/galaxy/scripts/mvc/library/library-folderlist-view.js
+2 -2
View File
@@ -132,7 +132,7 @@ var FolderListView = Backbone.View.extend({
}
this.paginate();
}
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
$("#center").css("overflow", "auto");
},
@@ -181,7 +181,7 @@ var FolderListView = Backbone.View.extend({
current_sort_order: false
});
});
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
this.checkEmptiness();
this.postRender();
},
client/galaxy/scripts/mvc/library/library-folderrow-view.js
+1 -1
View File
@@ -226,7 +226,7 @@ var FolderRowView = Backbone.View.extend({
this.render();
old_element.replaceWith(this.$el);
/* now we attach new tooltips to the newly created row element */
this.$el.find('[data-toggle="tooltip"]').tooltip({trigger: "hover"});
this.$el.find('[data-toggle="tooltip"]').tooltip({ trigger: "hover" });
},
templateRowFolder: function() {
client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+1 -1
View File
@@ -140,7 +140,7 @@ var FolderToolbarView = Backbone.View.extend({
$(".logged-dataset-manipulation").hide();
$(".dataset-manipulation").hide();
}
this.$el.find('[data-toggle="tooltip"]').tooltip({trigger: "hover"});
this.$el.find('[data-toggle="tooltip"]').tooltip({ trigger: "hover" });
},
createFolderFromModal: function(event) {
client/galaxy/scripts/mvc/library/library-library-view.js
+1 -1
View File
@@ -78,7 +78,7 @@ var LibraryView = Backbone.View.extend({
mod_toastr.error("An error occurred while attempting to fetch library permissions.");
});
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
//hack to show scrollbars
$("#center").css("overflow", "auto");
},
client/galaxy/scripts/mvc/library/library-librarylist-view.js
+1 -1
View File
@@ -124,7 +124,7 @@ var LibraryListView = Backbone.View.extend({
);
Galaxy.libraries.libraryToolbarView.renderPaginator(this.options);
}
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
$("#center").css("overflow", "auto");
},
client/galaxy/scripts/mvc/library/library-libraryrow-view.js
+2 -2
View File
@@ -47,7 +47,7 @@ var LibraryRowView = Backbone.View.extend({
repaint: function(library) {
/* need to dispose manually because of the element removal in setElement
invoked in render() */
this.$el.find('[data-toggle="tooltip"]').tooltip('dispose');
this.$el.find('[data-toggle="tooltip"]').tooltip("dispose");
/* we need to store the old element to be able to replace it with
new one */
var old_element = this.$el;
@@ -56,7 +56,7 @@ var LibraryRowView = Backbone.View.extend({
this.render();
old_element.replaceWith(this.$el);
/* now we attach new tooltips to the newly created row element */
this.$el.find('[data-toggle="tooltip"]').tooltip({trigger: "hover"});
this.$el.find('[data-toggle="tooltip"]').tooltip({ trigger: "hover" });
},
/**
client/galaxy/scripts/mvc/ui/ui-misc.js
+5 -2
View File
@@ -197,8 +197,11 @@ export var TextSelect = Backbone.View.extend({
this.model.get("onchange")(this.value());
}
});
this.setElement($("<div/>").append(this.select.$el)
.append(this.text.$el));
this.setElement(
$("<div/>")
.append(this.select.$el)
.append(this.text.$el)
);
this.update(this.model.get("data"));
},
wait: function() {
client/galaxy/scripts/toolshed/groups/group-detail-view.js
+1 -1
View File
@@ -42,7 +42,7 @@ const GroupDetailView = Backbone.View.extend({
render: function() {
const template = this.templateRow();
this.$el.html(template({ group: this.model }));
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
$("#center").css("overflow", "auto");
},
client/galaxy/scripts/toolshed/groups/group-list-view.js
+1 -1
View File
@@ -41,7 +41,7 @@ const GroupListView = Backbone.View.extend({
const template = this.templateGroupsList();
this.$el.html(template({ length: window.globalTS.groups.collection.models.length }));
this.renderRows(window.globalTS.groups.collection.models);
$('#center [data-toggle="tooltip"]').tooltip({trigger: "hover"});
$('#center [data-toggle="tooltip"]').tooltip({ trigger: "hover" });
$("#center").css("overflow", "auto");
},