Skip to content

Commit

Permalink
upgrade jquery ckeditor and bootstrap versions (#2720)
Browse files Browse the repository at this point in the history
* upgrade jquery ckeditor and bootstrap versions

* update lock files for new ckeditor version

* remove ckeditor 4.x init require

* replace src button.js with dist button.js

* replace bootstrap.min with bootstrap.bundle.min which includes correct popperjs version

* override broken modal fade in bootstrap 4

* fix cucumber

---------

Co-authored-by: Sri Harsha <sriharsha.poosa@gmail.com>
  • Loading branch information
RyanEddyIC and sri49 authored Jul 9, 2024
1 parent 424a607 commit 522b688
Show file tree
Hide file tree
Showing 19 changed files with 10,579 additions and 137 deletions.
5 changes: 2 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ PATH
notifier (0.0.1)
aasm (~> 4.8.0)
acapi
ckeditor (= 4.2.4)
ckeditor (= 5.0.0)
combine_pdf
config
curl
Expand Down Expand Up @@ -342,8 +342,7 @@ GEM
coffee-rails (>= 3.2)
railties (>= 3.0)
sassc-rails (>= 2.1.2)
ckeditor (4.2.4)
cocaine
ckeditor (5.0.0)
orm_adapter (~> 0.5.0)
climate_control (0.2.0)
cocaine (0.6.0)
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/application.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery2
//= require jquery-ui
//= require jquery_ujs
//= require bootstrap.min
//= require bootstrap.bundle.min
//= require bootstrap-multiselect
//= require jquery.selectric.min
//= require turbolinks
Expand Down
308 changes: 206 additions & 102 deletions app/assets/javascripts/button.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/assets/javascripts/ui-components/components.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery
//= require jquery2
//= require jquery_ujs
//= require jquery-ui
//= require bootstrap.min
//= require bootstrap.bundle.min
//= require bootstrap-treeview
//= require jquery.selectric.min
//= require bowser.min
Expand Down
13 changes: 13 additions & 0 deletions app/assets/stylesheets/bootstrap_overrides.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -457,3 +457,16 @@ strong {
}
}
}

// Upgrading Bootstrap 3 to 4 breaks modals with top level fade class
.modal.fade {
transition: opacity 0.15s linear;
}

.modal.fade.show {
opacity: 1;
}

.modal.fade:not(.show) {
opacity: 0;
}
Loading

0 comments on commit 522b688

Please sign in to comment.