Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE] Remove global bar component #3561

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ group :test do
gem "mocha", require: false
gem "shoulda-context"
gem "simplecov"
gem "timecop"
gem "webmock"
end
2 changes: 0 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,6 @@ GEM
terser (1.2.4)
execjs (>= 0.3.0, < 3)
thor (1.3.2)
timecop (0.9.10)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -629,7 +628,6 @@ DEPENDENCIES
simplecov
sprockets-rails
terser
timecop
webmock

RUBY VERSION
Expand Down
3 changes: 0 additions & 3 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,4 @@
//= require govuk_publishing_components/components/skip-link
//= require govuk_publishing_components/components/search-with-autocomplete

//= require modules/global-bar

//= require global-bar-init
//= require surveys
114 changes: 0 additions & 114 deletions app/assets/javascripts/global-bar-init.js

This file was deleted.

10 changes: 0 additions & 10 deletions app/assets/javascripts/libs/GlobalBarHelper.js

This file was deleted.

91 changes: 0 additions & 91 deletions app/assets/javascripts/modules/global-bar.js

This file was deleted.

8 changes: 1 addition & 7 deletions app/assets/javascripts/surveys.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,6 @@
if (userSurveys.canShowAnySurvey()) {
var activeSurvey = userSurveys.getActiveSurvey(userSurveys.defaultSurvey, userSurveys.smallSurveys)
if (activeSurvey !== undefined) {
// Hide global bar if one is showing
var globalBar = document.getElementById('global-bar')
if (globalBar) {
globalBar.style.display = 'none'
}
userSurveys.displaySurvey(activeSurvey)
}
}
Expand Down Expand Up @@ -434,8 +429,7 @@
}
var notificationIds = [
'.emergency-banner',
'#taxonomy-survey',
'#global-bar' // Currently about Coronavirus
'#taxonomy-survey'
]
var count = 0
for (var i = 0; i < notificationIds.length; i++) {
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
@import "govuk_publishing_components/components/layout-header";
@import "govuk_publishing_components/components/layout-super-navigation-header";

@import "components/global-bar";
@import "components/survey";

@import "helpers/draft";
82 changes: 0 additions & 82 deletions app/assets/stylesheets/components/_global-bar.scss

This file was deleted.

5 changes: 0 additions & 5 deletions app/helpers/timed_update_helper.rb

This file was deleted.

Loading
Loading