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

Only expand by default when using a chart that requires confirmation before running

Browse Source
This commit is contained in:
Dannon Baker
2022-11-17 14:55:08 -05:00
parent c863b9c205
commit 7bc1559052
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/mvc/visualization/chart/chart-client.js
+6
View File
@@ -10,6 +10,11 @@ import Editor from "mvc/visualization/chart/views/editor";
import Viewer from "mvc/visualization/chart/views/viewer";
import Menu from "mvc/visualization/chart/views/menu";
/** Get boolean as string */
function asBoolean(value) {
return String(value).toLowerCase() == "true";
}
export default Backbone.View.extend({
initialize: function (options) {
const Galaxy = getGalaxyInstance();
@@ -26,6 +31,7 @@ export default Backbone.View.extend({
this.$buttons = this.$(".charts-buttons");
this.chart = new Chart({}, options);
this.chart.plugin = options.visualization_plugin;
this.chart.requiresConfirmation = asBoolean(this.chart.plugin.specs.confirm);
this.chart.plugin.specs = this.chart.plugin.specs || {};
this.chart_load = options.chart_load;
this.message = new Ui.Message();
client/src/mvc/visualization/chart/views/menu.js
+1 -1
View File
@@ -5,7 +5,7 @@ import Ui from "mvc/ui/ui-misc";
export default Backbone.View.extend({
initialize: function (app) {
this.app = app;
this.model = new Backbone.Model({ visible: true });
this.model = new Backbone.Model({ visible: app.chart.requiresConfirmation });
this.execute_button = new Ui.Button({
icon: "fa-check-square",
tooltip: "Confirm",
client/src/mvc/visualization/chart/views/viewer.js
+1 -6
View File
@@ -30,7 +30,7 @@ export default Backbone.View.extend({
this.$text = this.$(".text");
this._fullscreen(this.$el, 20);
this.chart.on("redraw", function (confirmed) {
if (!self.chart.get("modified") || !self._asBoolean(self.chart.plugin.specs.confirm) || confirmed) {
if (!self.chart.get("modified") || !self.chart.requiresConfirmation || confirmed) {
self.app.deferred.execute(function (process) {
console.debug("viewer:redraw() - Redrawing...");
self._draw(process, self.chart);
@@ -71,11 +71,6 @@ export default Backbone.View.extend({
});
},
/** Get boolean as string */
_asBoolean: function (value) {
return String(value).toLowerCase() == "true";
},
/** Force resize to fullscreen */
_fullscreen: function ($el, margin) {
$el.css("height", $(window).height() - margin);