diff --git a/client/galaxy/scripts/apps/admin.js b/client/galaxy/scripts/apps/admin.js index 6d6f745e0f4..569dffc330f 100644 --- a/client/galaxy/scripts/apps/admin.js +++ b/client/galaxy/scripts/apps/admin.js @@ -10,7 +10,7 @@ import QueryStringParsing from "utils/query-string-parsing"; import Router from "layout/router"; import Utils from "utils/utils"; import Page from "layout/page"; -import Vue from "libs/vue"; +import Vue from "vue"; import UserAPIKeys from "components/UserAPIKeys.vue"; window.app = function app(options, bootstrapped) { diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js index 08d3d12f16c..2be9e2a39c5 100644 --- a/client/galaxy/scripts/apps/analysis.js +++ b/client/galaxy/scripts/apps/analysis.js @@ -22,7 +22,7 @@ import Ui from "mvc/ui/ui-misc"; import DatasetError from "mvc/dataset/dataset-error"; import DatasetEditAttributes from "mvc/dataset/dataset-edit-attributes"; import Citations from "components/Citations.vue"; -import Vue from "libs/vue"; +import Vue from "vue"; /** define the 'Analyze Data'/analysis/main/home page for Galaxy * * has a masthead diff --git a/client/galaxy/scripts/galaxy.interactive_environments.js b/client/galaxy/scripts/galaxy.interactive_environments.js index 19f41e02f54..e17b3a62835 100644 --- a/client/galaxy/scripts/galaxy.interactive_environments.js +++ b/client/galaxy/scripts/galaxy.interactive_environments.js @@ -6,9 +6,7 @@ export function append_notebook(url) { clear_main_area(); $("#main").append( - `` + `` ); } @@ -21,9 +19,7 @@ export function clear_main_area() { export function display_spinner() { $("#main").append( - `` + `` ); } diff --git a/client/galaxy/scripts/galaxy.pages.js b/client/galaxy/scripts/galaxy.pages.js index 9d16e88e5dd..ed673e70037 100644 --- a/client/galaxy/scripts/galaxy.pages.js +++ b/client/galaxy/scripts/galaxy.pages.js @@ -154,11 +154,7 @@ WYMeditor.editor.prototype.dialog = function(dialogType, dialogFeatures, bodyHtm } show_modal( "Create Link", - `


`, + `


`, { "Make link": function() { // Get URL, name/title. diff --git a/client/galaxy/scripts/layout/modal.js b/client/galaxy/scripts/layout/modal.js index d359f59fef5..4f8120f29a7 100644 --- a/client/galaxy/scripts/layout/modal.js +++ b/client/galaxy/scripts/layout/modal.js @@ -154,9 +154,9 @@ function show_in_overlay(options) { closeButton: true, title: " ", body: $( - `
` + `
` ) }); modal.show({ backdrop: true }); diff --git a/client/galaxy/scripts/mvc/grid/grid-template.js b/client/galaxy/scripts/mvc/grid/grid-template.js index 5fafae695b1..5299ab1a87f 100644 --- a/client/galaxy/scripts/mvc/grid/grid-template.js +++ b/client/galaxy/scripts/mvc/grid/grid-template.js @@ -180,9 +180,7 @@ export default { if (options.operations.length !== 0) { tmpl += `
`; } - tmpl += `${value}`; + tmpl += `${value}`; if (options.operations.length !== 0) { tmpl += "
"; } @@ -262,21 +260,13 @@ export default { if (page_index == options.cur_page_num) { tmpl += `${page_index}`; } else { - tmpl += `${ - page_index - }`; + tmpl += `${page_index}`; } } // show last page if (max_page < num_pages) { - tmpl += `...${ - num_pages - }`; + tmpl += `...${num_pages}`; } tmpl += ""; @@ -386,9 +376,7 @@ export default { // // standard search // - var tmpl = `