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

Jump to bottom

tests: use jQuery from node_modules. #28059

Merged
merged 3 commits into from Jan 15, 2019
Merged

tests: use jQuery from node_modules. #28059

merged 3 commits into from Jan 15, 2019

Conversation

XhmikosR
Copy link
Member

@XhmikosR XhmikosR commented Jan 15, 2019 •
edited

TODO:

  • See if we can remove the whole inline script from js/tests/index.html for loading jQuery.

@XhmikosR XhmikosR added this to Inbox in v4.3 via automation Jan 15, 2019
@XhmikosR XhmikosR requested a review from a team as a code owner January 15, 2019 15:31
@XhmikosR XhmikosR merged commit 3aeda99 into v4-dev Jan 15, 2019
v4.3 automation moved this from Inbox to Shipped Jan 15, 2019
@XhmikosR XhmikosR deleted the v4-dev-tests-jquery branch January 15, 2019 16:01
bkdotcom added a commit to bkdotcom/bootstrap that referenced this pull request Jan 16, 2019
@bkdotcom
Merge branch 'v4-dev' into modal_input_autofocus_keyboard_focus
81c578b 
* v4-dev: (34 commits)
  tests: use jQuery from node_modules. (twbs#28059)
  Fix `js-main` script. (twbs#28057)
  Make progress animation respect `$enable-transitions` and `prefers-reduced-motion` media query
  Examples: add tabindex="-1" and aria-disabled="true" on disabled links
  Clean up .gitignore. (twbs#28050)
  Fix Carousel's touch option to not add touch listeners when set to false (twbs#28046)
  Remove map-merge (twbs#28033)
  Cleanup popover arrows (twbs#28008)
  Sync dropdown font size to base font size
  Sync dropdown font size with btn font size
  Remove background from nested tables
  Add some margin below the buttons
  Fix background size y
  Minify background property
  Combine background properties into one
  Prevent useless property rendering
  Don't render a background by default
  Prevent rendering of color property by default
  Change comment heading title to `Typography` (twbs#28032)
  Align toast variables (twbs#28041)
  ...

# Conflicts:
#	package.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Johann-S Johann-S Johann-S approved these changes

Assignees
No one assigned
Labels
js v4
Projects
No open projects
v4.3
  
Shipped
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@XhmikosR @Johann-S