From 624598f6308e05c7b6b2b3acdebf0cc142e3e752 Mon Sep 17 00:00:00 2001 From: Tim Hostetler <6970899+thostetler@users.noreply.github.com> Date: Mon, 13 Apr 2020 10:36:41 -0400 Subject: [PATCH 01/46] Fix modal label from showing up below content This was causing an extra scrollbar to appear at times --- src/js/widgets/alerts/modal_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/widgets/alerts/modal_view.js b/src/js/widgets/alerts/modal_view.js index c97a09f68..35211e899 100644 --- a/src/js/widgets/alerts/modal_view.js +++ b/src/js/widgets/alerts/modal_view.js @@ -26,7 +26,7 @@ define([ $('body').append(() => { let out = ''; if ($('#alert-modal-label').length === 0) { - out += '
Alert
'; + out += '
Alert
'; } out += From 84ee72f1fc73d8e128b8b612ad046cb9e8fbda34 Mon Sep 17 00:00:00 2001 From: Tim Hostetler <6970899+thostetler@users.noreply.github.com> Date: Wed, 15 Apr 2020 17:30:33 -0400 Subject: [PATCH 02/46] add submodule --- .gitignore | 1 + .gitmodules | 3 +++ src/shared | 1 + 3 files changed, 5 insertions(+) create mode 100644 .gitmodules create mode 160000 src/shared diff --git a/.gitignore b/.gitignore index 0c080ba78..c0c43c7a8 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ grunt/requirejs.js package-lock.json !.nvmrc !.prettierrc +!.gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..6e7a9ce3f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/shared"] + path = src/shared + url = git@github.com:adsabs/ui-component-library.git diff --git a/src/shared b/src/shared new file mode 160000 index 000000000..444ee8c90 --- /dev/null +++ b/src/shared @@ -0,0 +1 @@ +Subproject commit 444ee8c90168499802f87840a9782e053c666286 From 23f9aa0da25d538f188204eb04d7d0409e3be7a8 Mon Sep 17 00:00:00 2001 From: Tim Hostetler <6970899+thostetler@users.noreply.github.com> Date: Wed, 15 Apr 2020 17:56:54 -0400 Subject: [PATCH 03/46] update travis --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 487533240..95002b426 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: node_js -node_js: "11.14.0" +node_js: '11.14.0' cache: npm +git: + submodules: false before_install: npm install -g grunt-cli install: npm install deployg: grunt release @@ -10,5 +12,5 @@ script: #- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo "grunt sauce"; grunt sauce; fi env: global: - - secure: "QiHFURctWLbr3uGEwqgABdKBzzXHHD819h4XTQsJ90Lcv04DsSzXZV0GAHa1bXiNIrNwxZD7T7fsakOBViEjIsginD1ZFAUMkR5KHYII3Gzlpu1ikuIHBrrPRLzTFhrsnJxFDRau9gwLeIoTgIP5AC3bw8ne/+6Oe6mW2fpphgU=" - - secure: "SRFYya2d43gzs0WWmYhIqekI1gUoxqeox/hlc7vn6dEWxVNFsHA0oWkMSivSY8y9fqvUyh4p40e4NDlN86EnGF9aq/r4iNBMlIR0UVuxjVBi8HaMR5w3/JvlD7gNI7Y6du0cpkJaVAekJbi21HP1bmcV0sYXcXUj6uL4HUVq4sw=" + - secure: 'QiHFURctWLbr3uGEwqgABdKBzzXHHD819h4XTQsJ90Lcv04DsSzXZV0GAHa1bXiNIrNwxZD7T7fsakOBViEjIsginD1ZFAUMkR5KHYII3Gzlpu1ikuIHBrrPRLzTFhrsnJxFDRau9gwLeIoTgIP5AC3bw8ne/+6Oe6mW2fpphgU=' + - secure: 'SRFYya2d43gzs0WWmYhIqekI1gUoxqeox/hlc7vn6dEWxVNFsHA0oWkMSivSY8y9fqvUyh4p40e4NDlN86EnGF9aq/r4iNBMlIR0UVuxjVBi8HaMR5w3/JvlD7gNI7Y6du0cpkJaVAekJbi21HP1bmcV0sYXcXUj6uL4HUVq4sw=' From 5e0cd849eeda21f8ea9093e47fcffaf431402311 Mon Sep 17 00:00:00 2001 From: Tim Hostetler <6970899+thostetler@users.noreply.github.com> Date: Wed, 22 Apr 2020 13:25:59 -0400 Subject: [PATCH 04/46] fix skip-navigation link --- src/js/apps/discovery/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/apps/discovery/main.js b/src/js/apps/discovery/main.js index 3c4be6224..8edcbb6f9 100644 --- a/src/js/apps/discovery/main.js +++ b/src/js/apps/discovery/main.js @@ -131,6 +131,7 @@ define(['config/discovery.config', 'module'], function(config, module) { // accessibility: skip to main content $('body').on('click', '#skip-to-main-content', function() { + $('#main-content').focus(); return false; }); From 7a9d2de66cc2e116955296c5ee3b1a05c662d43c Mon Sep 17 00:00:00 2001 From: Tim Hostetler <6970899+thostetler@users.noreply.github.com> Date: Wed, 22 Apr 2020 14:24:19 -0400 Subject: [PATCH 05/46] fix delete button for custom formats --- src/js/widgets/preferences/templates/application.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/widgets/preferences/templates/application.html b/src/js/widgets/preferences/templates/application.html index c132f45f4..4e22d65e8 100644 --- a/src/js/widgets/preferences/templates/application.html +++ b/src/js/widgets/preferences/templates/application.html @@ -209,7 +209,7 @@ title="edit custom format"> - From 90a1d15f1daa9fe13cf8283ee76818d108c0d229 Mon Sep 17 00:00:00 2001 From: Tim Hostetler <6970899+thostetler@users.noreply.github.com> Date: Wed, 22 Apr 2020 14:18:46 -0400 Subject: [PATCH 06/46] Change 'Customize Settings' to 'Settings' in nav --- src/js/widgets/navbar/template/navbar.html | 2 +- src/js/widgets/user_navbar/nav_template.html | 4 ++-- src/js/wraps/user_settings_page_manager/user_nav.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/widgets/navbar/template/navbar.html b/src/js/widgets/navbar/template/navbar.html index 56a5c01fc..b751c3b6f 100644 --- a/src/js/widgets/navbar/template/navbar.html +++ b/src/js/widgets/navbar/template/navbar.html @@ -172,7 +172,7 @@

ads

  • You are signed in as
    {{currentUser}}
  • My Home Page
  • ADS Libraries
  • -
  • Customize Settings
  • +
  • Settings
  • Log Out
  • diff --git a/src/js/widgets/user_navbar/nav_template.html b/src/js/widgets/user_navbar/nav_template.html index 57a075904..e08f5e0dd 100644 --- a/src/js/widgets/user_navbar/nav_template.html +++ b/src/js/widgets/user_navbar/nav_template.html @@ -11,8 +11,8 @@
  • - Customize Settings + Settings
  • diff --git a/src/js/wraps/user_settings_page_manager/user_nav.html b/src/js/wraps/user_settings_page_manager/user_nav.html index 9aa824d8d..2020ab19d 100644 --- a/src/js/wraps/user_settings_page_manager/user_nav.html +++ b/src/js/wraps/user_settings_page_manager/user_nav.html @@ -1,6 +1,6 @@