Skip to content

Commit

Permalink
Attach workflow globals to window, temporarily. We can refactor and u…
Browse files Browse the repository at this point in the history
…se a singleton in a module down the road or something else.
  • Loading branch information
dannon committed Oct 25, 2017
1 parent 125367a commit 6eed84d
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 20 deletions.
5 changes: 3 additions & 2 deletions client/galaxy/scripts/mvc/workflow/workflow-terminals.js
@@ -1,4 +1,5 @@
import Globals from "mvc/workflow/workflow-globals";
// TODO; tie into Galaxy state?
window.workflow_globals = window.workflow_globals || {};
function CollectionTypeDescription(collectionType) {
this.collectionType = collectionType;
this.isCollection = true;
Expand Down Expand Up @@ -369,7 +370,7 @@ var BaseInputTerminal = Terminal.extend({
other_datatype == "input" ||
other_datatype == "_sniff_" ||
other_datatype == "input_collection" ||
Globals.app.isSubType(
window.workflow_globals.app.isSubType(
cat_outputs[other_datatype_i],
thisDatatype
)
Expand Down
8 changes: 5 additions & 3 deletions client/galaxy/scripts/mvc/workflow/workflow-view-data.js
@@ -1,4 +1,6 @@
import Globals from "mvc/workflow/workflow-globals";
// TODO; tie into Galaxy state?
window.workflow_globals = window.workflow_globals || {};

var DataInputView = Backbone.View.extend({
className: "form-row dataRow input-data-row",

Expand Down Expand Up @@ -132,8 +134,8 @@ var OutputCalloutView = Backbone.View.extend({
"static/images/fugue/asterisk-small.png"
);
}
Globals.workflow.has_changes = true;
Globals.canvas_manager.draw_overview();
window.workflow_globals.workflow.has_changes = true;
window.workflow_globals.canvas_manager.draw_overview();
})
)
)
Expand Down
9 changes: 6 additions & 3 deletions client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js
@@ -1,6 +1,9 @@
import Globals from "mvc/workflow/workflow-globals";
import Terminals from "mvc/workflow/workflow-terminals";
import Connector from "mvc/workflow/workflow-connector";

// TODO; tie into Galaxy state?
window.workflow_globals = window.workflow_globals || {};

var TerminalMappingView = Backbone.View.extend({
tagName: "div",
className: "fa-icon-button fa fa-folder-o",
Expand Down Expand Up @@ -196,7 +199,7 @@ var BaseOutputTerminalView = TerminalView.extend({
$(d.proxy).css({ left: x, top: y });
d.proxy.terminal.redraw();
// FIXME: global
Globals.canvas_manager.update_viewport_overlay();
window.workflow_globals.canvas_manager.update_viewport_overlay();
};
onmove();
$("#canvas-container")
Expand All @@ -206,7 +209,7 @@ var BaseOutputTerminalView = TerminalView.extend({
onDragStart: function(e, d) {
$(d.available).addClass("input-terminal-active");
// Save PJAs in the case of change datatype actions.
Globals.workflow.check_changes_in_active_form();
window.workflow_globals.workflow.check_changes_in_active_form();
// Drag proxy div
var h = $(
'<div class="drag-terminal" style="position: absolute;"></div>'
Expand Down
11 changes: 7 additions & 4 deletions client/galaxy/scripts/mvc/workflow/workflow-view.js
@@ -1,5 +1,4 @@
import Utils from "utils/utils";
import Globals from "mvc/workflow/workflow-globals";
import Workflow from "mvc/workflow/workflow-manager";
import WorkflowCanvas from "mvc/workflow/workflow-canvas";
import Node from "mvc/workflow/workflow-node";
Expand All @@ -9,6 +8,10 @@ import Ui from "mvc/ui/ui-misc";
import async_save_text from "utils/async-save-text";
import Toastr from "libs/toastr";
import "ui/editable-text";

// TODO; tie into Galaxy state?
window.workflow_globals = window.workflow_globals || {};

// Reset tool search to start state.
function reset_tool_search(initValue) {
// Function may be called in top frame or in tool_menu_frame;
Expand Down Expand Up @@ -54,7 +57,7 @@ function add_node_icon($to_el, nodeType) {
// create form view
export default Backbone.View.extend({
initialize: function(options) {
var self = (Globals.app = this);
var self = (window.workflow_globals.app = this);
this.options = options;
this.urls = (options && options.urls) || {};
var close_editor = function() {
Expand Down Expand Up @@ -225,7 +228,7 @@ export default Backbone.View.extend({
});

// Canvas overview management
this.canvas_manager = Globals.canvas_manager = new WorkflowCanvas(
this.canvas_manager = window.workflow_globals.canvas_manager = new WorkflowCanvas(
this,
$("#canvas-viewport"),
$("#overview")
Expand Down Expand Up @@ -632,7 +635,7 @@ export default Backbone.View.extend({
// Global state for the whole workflow
reset: function() {
this.workflow && this.workflow.remove_all();
this.workflow = Globals.workflow = new Workflow(
this.workflow = window.workflow_globals.workflow = new Workflow(
this,
$("#canvas-container")
);
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/workflow/workflow-terminals.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/maps/mvc/workflow/workflow-view-data.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/maps/mvc/workflow/workflow-view-terminals.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/maps/mvc/workflow/workflow-view.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/mvc/workflow/workflow-terminals.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6eed84d

Please sign in to comment.