Unverified Commit 58c6be84 authored by Mason Houtz's avatar Mason Houtz Committed by Nicola Soranzo
Browse files

Fixed uploader link on tool list and legacy empty history message

parent 65e702b5
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@
<script>
import ToolSection from "./Common/ToolSection";
import ToolSearch from "./Common/ToolSearch";
import { UploadButton } from "components/Upload";
import { UploadButton, openGlobalUploadModal } from "components/Upload";
import FavoritesButton from "./Buttons/FavoritesButton";
import { filterToolSections, filterTools } from "./utilities";
import { getGalaxyInstance } from "app";
@@ -145,7 +145,7 @@ export default {
        onOpen(tool, evt) {
            if (tool.id === "upload1") {
                evt.preventDefault();
                this.eventHub.$emit("upload:open");
                openGlobalUploadModal();
            } else if (tool.form_style === "regular") {
                evt.preventDefault();
                const Galaxy = getGalaxyInstance();
+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import { getGalaxyInstance } from "app";
import HISTORY_VIEW_EDIT from "mvc/history/history-view-edit";
import BASE_MVC from "mvc/base-mvc";
import _l from "utils/localization";
import { eventHub } from "components/plugins/eventHub";
import { openGlobalUploadModal } from "components/Upload";

// ============================================================================
/** session storage for history panel preferences (and to maintain state)
@@ -338,7 +338,7 @@ var CurrentHistoryView = _super.extend(
        events: _.extend(_.clone(_super.prototype.events), {
            // the two links in the empty message
            "click .uploader-link": function (ev) {
                eventHub.$emit("upload:open");
                openGlobalUploadModal();
            },
            "click .get-data-link": function (ev) {
                var $toolMenu = $(".toolMenuContainer");