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

Merge pull request #5878 from jmchilton/fixbuild

Browse Source 
Minor build fixes.
This commit is contained in:
Nicola Soranzo
2018-04-12 10:42:00 +01:00
committed by GitHub
parent acff3b2e95 fa1231e9ec
commit 1583db76eb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/workflow/workflow-connector.js
+2 -2
View File
@@ -43,8 +43,8 @@ $.extend(Connector.prototype, {
this.canvas.style.zIndex = "300";
}
}
this.canvas.setAttribute("handle1-id", handle1 ? handle1.element.getAttribute("id") : "");
this.canvas.setAttribute("handle2-id", handle2 ? handle2.element.getAttribute("id") : "");
this.canvas.setAttribute("handle1-id", handle1 && handle1.element.getAttribute ? handle1.element.getAttribute("id") : "");
this.canvas.setAttribute("handle2-id", handle2 && handle2.element.getAttribute ? handle2.element.getAttribute("id") : "");
var relativeLeft = e => $(e).offset().left - canvas_container.offset().left;
var relativeTop = e => $(e).offset().top - canvas_container.offset().top;
if (!handle1 || !handle2) {
test/selenium_tests/test_workflow_editor.py
+2 -2
View File
@@ -26,7 +26,7 @@ class WorkflowEditorTestCase(SeleniumTestCase):
name = self.workflow_create_new()
editor.canvas_body.wait_for_visible()
menu_element = editor.tool_menu.wait_for_visible()
editor.tool_menu.wait_for_visible()
editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
editor.tool_menu_item_link(section_name="inputs", item_name="data_input").wait_for_and_click()
self.screenshot("workflow_editor_data_input_new")
@@ -53,7 +53,7 @@ class WorkflowEditorTestCase(SeleniumTestCase):
name = self.workflow_create_new()
editor.canvas_body.wait_for_visible()
menu_element = editor.tool_menu.wait_for_visible()
editor.tool_menu.wait_for_visible()
editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
editor.tool_menu_item_link(section_name="inputs", item_name="data_collection_input").wait_for_and_click()
self.screenshot("workflow_editor_data_input_collection_new")