Merge pull request #7415 from dannon/fix-workflow-drop-hack

[19.01] Fix workflow list drop-to-upload
galaxyproject · Feb 26, 2019 · 7553326 · 7553326
2 parents bd25ff9 + 1583eec
commit 7553326
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/client/galaxy/scripts/apps/extended.js b/client/galaxy/scripts/apps/extended.js
@@ -82,4 +82,4 @@ export function multiHistory(options) {
 }
 
 // Used in common.mako
-export { default as store } from "store";
+export { default as store } from "store";
diff --git a/client/galaxy/scripts/components/admin/ErrorStack.vue b/client/galaxy/scripts/components/admin/ErrorStack.vue
@@ -12,18 +12,18 @@
     </div>
 </template>
 <script>
-import { getErrorStack } from "./AdminServices.js"
+import { getErrorStack } from "./AdminServices.js";
 
 export default {
     data() {
         return {
             errorStack: [],
             errorStackLoaded: false,
             errorStackAttributes: [
-                { key: 'time', sortable: true },
-                { key: 'phase', sortable: true },
-                { key: 'file', sortable: true },
-                { key: 'error' }
+                { key: "time", sortable: true },
+                { key: "phase", sortable: true },
+                { key: "file", sortable: true },
+                { key: "error" }
             ],
             messageText: null
         };

diff --git a/client/galaxy/scripts/galaxy.interactive_environments.js b/client/galaxy/scripts/galaxy.interactive_environments.js
@@ -18,9 +18,7 @@ export function clear_main_area() {
 }
 
 export function display_spinner() {
-    $("#main").append(
-        `<div id="ie-loading-spinner"></div>`
-    );
+    $("#main").append(`<div id="ie-loading-spinner"></div>`);
 }
 
 /* Create a spin_state object used by spin() and spin_again() */

diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js
@@ -183,8 +183,10 @@ var View = Backbone.View.extend({
                         input.is_workflow =
                             (data_ref.step_linked && !self._isDataStep(data_ref.step_linked)) || input.wp_linked;
                     }
-                    if (is_data_input ||
-                        (input.value && input.value.__class__ == "RuntimeValue" && !input.step_linked)) {
+                    if (
+                        is_data_input ||
+                        (input.value && input.value.__class__ == "RuntimeValue" && !input.step_linked)
+                    ) {
                         step.collapsed = false;
                     }
                     if (is_runtime_value) {

diff --git a/client/galaxy/scripts/mvc/workflow/workflow.js b/client/galaxy/scripts/mvc/workflow/workflow.js
@@ -195,13 +195,14 @@ const WorkflowListView = Backbone.View.extend({
     },
 
     events: {
-        dragleave: "unhighlightDropZone",
-        drop: "drop",
-        dragover: function(ev) {
-            $(".hidden_description_layer").addClass("dragover");
-            $(".menubutton").addClass("background-none");
-            ev.preventDefault();
-        }
+        dragover: "highlightDropZone",
+        dragleave: "unhighlightDropZone"
+    },
+
+    highlightDropZone: function(ev) {
+        $(".hidden_description_layer").addClass("dragover");
+        $(".menubutton").addClass("background-none");
+        ev.preventDefault();
     },
 
     unhighlightDropZone: function() {
@@ -272,6 +273,9 @@ const WorkflowListView = Backbone.View.extend({
         this.searchWorkflow(this.$(".search-wf"), this.$(".workflow-search tr"), minQueryLength);
         this.adjustActiondropdown();
         this._showArgErrors();
+        this.$(".hidden_description_layer")
+            .get(0)
+            .addEventListener("drop", _.bind(this.drop, this));
         return this;
     },
 

diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss
@@ -2078,9 +2078,11 @@ div.toolTitleNoSection {
 
 /* Toolshed, reports custom styles from mako templates */
 body.toolshed {
-    margin: 0; padding: 0; overflow: hidden;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
     #left {
-        background: #C1C9E5 url(../../images/menu_bg.png) top repeat-x;
+        background: #c1c9e5 url(../../images/menu_bg.png) top repeat-x;
     }
     .unified-panel-body {
         overflow: auto;
@@ -2090,21 +2092,22 @@ body.toolshed {
     }
 }
 
-
 body.reports {
-    margin: 0; padding: 0; overflow: hidden;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
     #left {
-        background: #C1C9E5 url(../../images/menu_bg.png) top repeat-x;
+        background: #c1c9e5 url(../../images/menu_bg.png) top repeat-x;
     }
 }
 
 /* Used in Galaxy IE for spinner loading TODO: Remove in IE entrypoint refactoring */
 #ie-loading-spinner {
-    position:absolute;
-    margin:auto;
-    top:0;
-    left:0;
-    right:0;
-    bottom:0;
+    position: absolute;
+    margin: auto;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
     background: url(../../images/largespinner.gif) no-repeat center center fixed;
 }