Merge pull request #1520 from ODNZSL/main

staging -> production
ODNZSL · Oct 25, 2023 · c186858 · c186858
2 parents 88d09a9 + 130283d
commit c186858
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,7 +14,6 @@ gem 'sqlite3'
 gem 'bootsnap', '>= 1.1.0', require: false
 gem 'haml'
 gem 'jquery-rails'
-gem 'jquery-ui-rails'
 gem 'lograge', '~> 0.11.2'
 gem 'nokogiri', '~> 1.14.3'
 gem 'pandoc-ruby'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -179,8 +179,6 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
     json (2.5.1)
     launchy (2.5.0)
       addressable (~> 2.7)
@@ -442,7 +440,6 @@ DEPENDENCIES
   haml
   i18n
   jquery-rails
-  jquery-ui-rails
   letter_opener
   listen
   lograge (~> 0.11.2)

diff --git a/app/assets/javascripts/admin_application.js b/app/assets/javascripts/admin_application.js
@@ -5,7 +5,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require ckeditor-jquery
-//= require jquery-ui
+//= require jquery-ui/dist/jquery-ui.js
 //= require modernizr
 //= require foundation
 

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -4,9 +4,7 @@
 
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui/widgets/autocomplete
-//= require jquery-ui/widgets/sortable
-//= require jquery-ui/widgets/menu
+//= require jquery-ui/dist/jquery-ui.js
 
 //= require modernizr
 //= require foundation

diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
@@ -1,5 +1,5 @@
 /*
-*= require jquery-ui
+*= require jquery-ui/themes/base/core.css
 */
 
 @import 'color';

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -1,7 +1,7 @@
 /*
-*= require jquery-ui/autocomplete
-*= require jquery-ui/sortable
-*= require jquery-ui/menu
+*= require jquery-ui/themes/base/autocomplete.css
+*= require jquery-ui/themes/base/sortable.css
+*= require jquery-ui/themes/base/menu.css
 *= require_self
 *= require video-js
 */

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "yarn": "^1.3.2"
   },
   "dependencies": {
+    "jquery-ui": "^1.13.2",
     "puppeteer": "^2.0.0"
   },
   "devDependencies": {

diff --git a/yarn.lock b/yarn.lock
@@ -470,6 +470,18 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+jquery-ui@^1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034"
+  integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==
+  dependencies:
+    jquery ">=1.8.0 <4.0.0"
+
+"jquery@>=1.8.0 <4.0.0":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
+  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
+
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"