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.

Sign up for GitHub

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

Mmonteith/autocomplete #342

Merged
merged 15 commits into from
Jan 16, 2019
Merged

Mmonteith/autocomplete #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6abeb15
[refs #320] Remove jQuery and typeahead dependencies
chrimesdev Jan 2, 2019
cc43736
[refs #320] Initial setup and styling for autocomplete
chrimesdev Jan 2, 2019
5e05b4b
Remove npmignore file
chrimesdev Jan 2, 2019
b9275d6
[refs #320] Search autocomplete styling
davidhunter08 Jan 4, 2019
d0abb6b
[refs #320] Fixed autocomplete dropdown onclick event
Jan 7, 2019
c70ab03
[refs #320] Cursor pointer for links and remove whitespaces
Jan 7, 2019
0823945
[refs #320] Tidy up autocomplete - js and styling
mcheung-nhs Jan 11, 2019
98b6b1c
[refs #320] Remove search suggestions heading
mcheung-nhs Jan 15, 2019
735dd34
Merge remote-tracking branch 'origin/master' into autocomplete
mikemonteith Jan 16, 2019
defbaae
Fix package-lock differences betweeen npm5 and npm6
mikemonteith Jan 16, 2019
5b97d8f
[refs #320] Fix bug if no search in header, plus make it more efficient
mcheung-nhs Jan 16, 2019
0805d80
[refs #320] Reorder attribute order of <button> element
mcheung-nhs Jan 16, 2019
1109073
[refs #320] Remove TO DO commented lines
mcheung-nhs Jan 16, 2019
15e78c0
Merge branch 'master' into mmonteith/autocomplete
mcheung-nhs Jan 16, 2019
522f222
Merge branch 'master' into mmonteith/autocomplete
chrimesdev Jan 16, 2019
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
2 changes: 0 additions & 2 deletions .npmignore
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion app/_templates/layout.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<link href="{{ baseUrl }}/assets/nhsuk.css" rel="stylesheet">

<script src="{{ baseUrl }}/assets/nhsuk.js" defer></script>
<script src="{{ baseUrl }}/assets/libraries/jquery.min.js"></script>

<!--[if IE]><link rel="shortcut icon" href="{{ baseUrl }}/assets/favicons/favicon.ico"><![endif]-->
<!-- Touch Icons - iOS and Android 2.1+ 180x180 pixels in size. -->
Expand Down
2 changes: 0 additions & 2 deletions docs/installation/installing-compiled.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ If you require any of this functionality, you should [install using npm](/docs/i

<!-- Scripts -->
<script src="js/nhsuk-[latest version].min.js" defer></script>
<script src="js/jquery-3.3.1.min.js"></script>

<!-- Favicons -->
<!--[if IE]><link rel="shortcut icon" href="assets/favicons/favicon.ico"><![endif]-->
Expand Down Expand Up @@ -62,7 +61,6 @@ If you require any of this functionality, you should [install using npm](/docs/i

<!-- Scripts -->
<script src="js/nhsuk-[latest version].min.js" defer></script>
<script src="js/jquery-3.3.1.min.js"></script>

<!-- Favicons -->
<!--[if IE]><link rel="shortcut icon" href="assets/favicons/favicon.ico"><![endif]-->
Expand Down
28 changes: 0 additions & 28 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,31 +79,6 @@ function webpackJS() {
.pipe(gulp.dest('./dist'));
}

/* Concat the NHS.UK components JS with third party JS (typeahead). */
function concatJS() {
return gulp.src([
'packages/components/header/typeahead.bundle.min.js',
'packages/components/header/nhs.typeahead.js',
'dist/nhsuk.js',
])
.pipe(concat('nhsuk.js'))
.pipe(gulp.dest(['dist/']));
}

/* Delete the Webpack nhsuk.bundle.js after its been concatenated. */
function cleanJS() {
return del('dist/nhsuk.bundle.js');
}

/* Copy jQuery dependency into dist folder for release */
function thirdPartyAssets() {
return gulp.src('./node_modules/jquery/dist/jquery.min.js')
.pipe(rename({
basename: 'jquery-3.3.1.min',
}))
.pipe(gulp.dest('dist/'));
}

/* Minify the JS file for release */
function minifyJS() {
return gulp.src([
Expand Down Expand Up @@ -181,8 +156,6 @@ gulp.task('style', compileCSS);
gulp.task('build', gulp.series([
compileCSS,
webpackJS,
concatJS,
cleanJS,
]));
gulp.task('bundle', gulp.series([
cleanDist,
Expand All @@ -194,7 +167,6 @@ gulp.task('bundle', gulp.series([
gulp.task('zip', gulp.series([
'bundle',
assets,
thirdPartyAssets,
jsFolder,
cssFolder,
createZip
Expand Down
Loading