diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js index 1a4f6af1dac..8b14a1b24bc 100644 --- a/client/galaxy/scripts/apps/analysis.js +++ b/client/galaxy/scripts/apps/analysis.js @@ -101,14 +101,11 @@ window.app = function app(options, bootstrapped) { var model = new UserPreferences.Model({ user_id: Galaxy.params.id }); - this.page.display(new FormWrapper.View(_.extend( - model.get(form_id), - {active_tab: "user"} - ))); + this.page.display(new FormWrapper.View(_.extend(model.get(form_id), { active_tab: "user" }))); }, show_visualizations: function(action_id) { - var activeTab = action_id=="list_published"?"shared":"visualization"; + var activeTab = action_id == "list_published" ? "shared" : "visualization"; this.page.display( new GridShared.View({ action_id: action_id, @@ -207,7 +204,7 @@ window.app = function app(options, bootstrapped) { }, show_pages: function(action_id) { - var activeTab = action_id=="list_published"?"shared":"user"; + var activeTab = action_id == "list_published" ? "shared" : "user"; this.page.display( new GridShared.View({ action_id: action_id, @@ -330,10 +327,7 @@ window.app = function app(options, bootstrapped) { Utils.get({ url: `${Galaxy.root}api/workflows/${Utils.getQueryString("id")}/download?style=run`, success: response => { - this.page.display(new ToolFormComposite.View(_.extend( - response, - {active_tab: "workflow"} - ))); + this.page.display(new ToolFormComposite.View(_.extend(response, { active_tab: "workflow" }))); }, error: response => { var error_msg = response.err_msg || "Error occurred while loading the resource."; diff --git a/client/galaxy/scripts/components/PluginList.vue b/client/galaxy/scripts/components/PluginList.vue index 5c9b9f400b9..e30094e061e 100644 --- a/client/galaxy/scripts/components/PluginList.vue +++ b/client/galaxy/scripts/components/PluginList.vue @@ -133,4 +133,4 @@ export default { float: left; margin-top:10px; } - \ No newline at end of file + diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js index e79aad3b05b..44056299f67 100644 --- a/client/galaxy/scripts/layout/menu.js +++ b/client/galaxy/scripts/layout/menu.js @@ -285,7 +285,8 @@ var Collection = Backbone.Collection.extend({ title: _l("Saved Pages"), url: "pages/list", target: "_top" - },{ + }, + { title: _l("Saved Visualizations"), url: "visualizations/list", target: "_top" @@ -343,13 +344,13 @@ var Tab = Backbone.View.extend({ .attr("title", this.model.get("tooltip")) .tooltip("destroy"); this.model.get("tooltip") && this.$toggle.tooltip({ placement: "bottom" }); - if(!this.model.get("menu")){ + if (!this.model.get("menu")) { this.$dropdown .removeClass() .addClass("dropdown") .addClass(this.model.get("disabled") && "disabled") .addClass(this.model.get("active") && "active"); - }; + } if (this.model.get("menu") && this.model.get("show_menu")) { this.$menu.show(); $("#dd-helper") diff --git a/client/galaxy/scripts/mvc/form/form-wrapper.js b/client/galaxy/scripts/mvc/form/form-wrapper.js index 49247a8f8c0..5109b7f6aec 100644 --- a/client/galaxy/scripts/mvc/form/form-wrapper.js +++ b/client/galaxy/scripts/mvc/form/form-wrapper.js @@ -6,7 +6,7 @@ var View = Backbone.View.extend({ this.model = new Backbone.Model(options); this.url = this.model.get("url"); this.redirect = this.model.get("redirect"); - if (options && options.active_tab){ + if (options && options.active_tab) { this.active_tab = options.active_tab; } this.setElement("
"); diff --git a/client/galaxy/scripts/mvc/grid/grid-shared.js b/client/galaxy/scripts/mvc/grid/grid-shared.js index 170ad392ba6..09829e25c1e 100644 --- a/client/galaxy/scripts/mvc/grid/grid-shared.js +++ b/client/galaxy/scripts/mvc/grid/grid-shared.js @@ -9,7 +9,7 @@ var View = Backbone.View.extend({ this.model = new Backbone.Model(options); this.item = this.model.get("item"); this.title = this.model.get("plural"); - if (options && options.active_tab){ + if (options && options.active_tab) { this.active_tab = options.active_tab; } $.ajax({ diff --git a/client/galaxy/scripts/mvc/history/history-list.js b/client/galaxy/scripts/mvc/history/history-list.js index 4a470694915..9b4a01b5403 100644 --- a/client/galaxy/scripts/mvc/history/history-list.js +++ b/client/galaxy/scripts/mvc/history/history-list.js @@ -107,10 +107,9 @@ var View = Backbone.View.extend({ var self = this; LoadingIndicator.markViewAsLoading(this); - if(options.action_id == "list_published"){ + if (options.action_id == "list_published") { this.active_tab = "shared"; - } - else if (options.action_id = "list"){ + } else if ((options.action_id = "list")) { this.active_tab = "user"; } this.model = new Backbone.Model(); diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js index a2123487dcc..45ac7882d83 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form-composite.js +++ b/client/galaxy/scripts/mvc/tool/tool-form-composite.js @@ -15,7 +15,7 @@ var View = Backbone.View.extend({ this.modal = parent.Galaxy.modal || new Modal.View(); this.model = (options && options.model) || new Backbone.Model(options); this.deferred = new Deferred(); - if (options && options.active_tab){ + if (options && options.active_tab) { this.active_tab = options.active_tab; } this.setElement( @@ -303,17 +303,17 @@ var View = Backbone.View.extend({ }); this._append(this.$steps, this.history_form.$el); }, - + /** Render Workflow Options */ _renderResourceParameters: function() { this.workflow_resource_parameters_form = null; - if(!_.isEmpty(this.model.get('workflow_resource_parameters'))){ + if (!_.isEmpty(this.model.get("workflow_resource_parameters"))) { this.workflow_resource_parameters_form = new Form({ - cls : 'ui-portlet-narrow', - title : 'Workflow Resource Options', - inputs : this.model.get('workflow_resource_parameters') + cls: "ui-portlet-narrow", + title: "Workflow Resource Options", + inputs: this.model.get("workflow_resource_parameters") }); - this._append( this.$steps, this.workflow_resource_parameters_form.$el ); + this._append(this.$steps, this.workflow_resource_parameters_form.$el); } }, @@ -538,7 +538,9 @@ var View = Backbone.View.extend({ var job_def = { new_history_name: history_form_data["new_history|name"] ? history_form_data["new_history|name"] : null, history_id: !history_form_data["new_history|name"] ? this.model.get("history_id") : null, - resource_params: this.workflow_resource_parameters_form ? this.workflow_resource_parameters_form.data.create() : {}, + resource_params: this.workflow_resource_parameters_form + ? this.workflow_resource_parameters_form.data.create() + : {}, replacement_params: this.wp_form ? this.wp_form.data.create() : {}, parameters: {}, // Tool form will submit flat maps for each parameter diff --git a/client/galaxy/scripts/mvc/ui/ui-buttons.js b/client/galaxy/scripts/mvc/ui/ui-buttons.js index c8bbcc82ec9..b496778bfb8 100644 --- a/client/galaxy/scripts/mvc/ui/ui-buttons.js +++ b/client/galaxy/scripts/mvc/ui/ui-buttons.js @@ -15,7 +15,7 @@ var ButtonDefault = Backbone.View.extend({ wait_cls: "btn btn-info", disabled: false, percentage: -1, - visible: true, + visible: true }).set(options); this.setElement( $("") diff --git a/client/galaxy/scripts/mvc/ui/ui-misc.js b/client/galaxy/scripts/mvc/ui/ui-misc.js index c5ee45392b8..cf662044c96 100644 --- a/client/galaxy/scripts/mvc/ui/ui-misc.js +++ b/client/galaxy/scripts/mvc/ui/ui-misc.js @@ -47,7 +47,7 @@ export var Message = Backbone.View.extend({ fade: true }).set(options); this.listenTo(this.model, "change", this.render, this); - if (options && options.active_tab){ + if (options && options.active_tab) { this.active_tab = options.active_tab; } this.render(); diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/menu.js b/client/galaxy/scripts/mvc/visualization/chart/views/menu.js index a80bf234dbd..266a4de5263 100644 --- a/client/galaxy/scripts/mvc/visualization/chart/views/menu.js +++ b/client/galaxy/scripts/mvc/visualization/chart/views/menu.js @@ -122,13 +122,7 @@ export default Backbone.View.extend({ } } }); - this.buttons = [ - this.left_button, - this.right_button, - this.execute_button, - this.export_button, - this.save_button - ]; + this.buttons = [this.left_button, this.right_button, this.execute_button, this.export_button, this.save_button]; this.setElement(""); for (let b of this.buttons) { this.$el.append(b.$el); diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js b/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js index 47d7e742e3b..b36df06a9af 100644 --- a/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js +++ b/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js @@ -26,7 +26,7 @@ export default Backbone.View.extend({ this._fullscreen(this.$el, 20); this._createContainer("div"); this.chart.on("redraw", function(confirmed) { - if (!self.chart.get("modified") || !self.chart.plugin.specs.confirm || confirmed ) { + if (!self.chart.get("modified") || !self.chart.plugin.specs.confirm || confirmed) { self.app.deferred.execute(function(process) { console.debug("viewer:redraw() - Redrawing..."); self._draw(process, self.chart);