Adjusted package versions; fixed js includes in script-manager.js; re…

…-collected static assets
UCF · Feb 5, 2021 · 69b539e · 69b539e
1 parent 1d27076
commit 69b539e
Show file tree

Hide file tree

Showing 22 changed files with 2,464 additions and 1,107 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,20 +3,20 @@
   "dependencies": {
     "bootstrap-3-typeahead": "^4.0.2",
     "bootstrap-datepicker": "^1.9.0",
-    "@fortawesome/fontawesome-free": "^5.15.1",
-    "jquery-placeholder": "^2.3.1",
-    "timepicker": "^1.13.14",
+    "@fortawesome/fontawesome-free": "^5.15.2",
+    "select2": "^4.0.13",
+    "timepicker": "^1.13.16",
     "tinymce": "<5.0.0",
     "ucf-athena-framework": "^1.0.8"
   },
   "devDependencies": {
-    "@babel/cli": "^7.11.6",
-    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.11.5",
+    "@babel/cli": "^7.12.13",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
     "babel-eslint": "^10.1.0",
     "babel-plugin-transform-es2015-modules-strip": "^0.1.1",
-    "browser-sync": "^2.26.12",
-    "eslint": "^7.9.0",
+    "browser-sync": "^2.26.14",
+    "eslint": "^7.19.0",
     "gulp": "~4.0.2",
     "gulp-autoprefixer": "^7.0.1",
     "gulp-babel": "^8.0.0",
@@ -30,8 +30,7 @@
     "gulp-sass": "~4.1.0",
     "gulp-sass-lint": "^1.4.0",
     "gulp-uglify": "^3.0.2",
-    "merge": "^1.2.1",
-    "select2": "^4.0.13"
+    "merge": "^2.1.0"
   },
   "browserslist": [
     "last 2 versions",

diff --git a/static_files/assets/js/script-manager.js b/static_files/assets/js/script-manager.js
@@ -5,10 +5,10 @@
 //
 
 // TODO: Review these requirements and ensure they are working correctly
-// =require '/bootstrap-3-typeahead/bootstrap3-typeahead.js'
-// =require '/timepicker/jquery.timepicker.js'
-// =require '/bootstrap-datepicker/dist/js/bootstrap-datepicker.js'
-// =require '/select2/dist/js/select2.js
+// =require /bootstrap-3-typeahead/bootstrap3-typeahead.js
+// =require /timepicker/jquery.timepicker.js
+// =require /bootstrap-datepicker/dist/js/bootstrap-datepicker.js
+// =require /select2/dist/js/select2.js
 
 
 //
@@ -260,9 +260,7 @@ const initiateDatePickers = function (fields) {
         .on('click', function () {
           fallbackDtpOnClick($(this));
         });
-    })
-    .removeClass('placeholder') // placeholder plugin checks if this class exists on the field and won't reinitiate if it does.
-    .placeholder(); // Force init placeholder for old browsers
+    });
 
 };
 
@@ -302,9 +300,7 @@ const initiateTimePickers = function (fields) {
       scrollDefaultNow: true,
       timeFormat: 'h:i A',
       step: 15
-    })
-    .removeClass('placeholder') // placeholder plugin checks if this class exists on the field and won't reinitiate if it does.
-    .placeholder(); // Force init placeholder for old browsers
+    });
 };
 
 

diff --git a/static_files/assets/js/script.js b/static_files/assets/js/script.js
@@ -4,8 +4,6 @@
 // Import third-party assets
 //
 
-// =require jquery-placeholder/jquery.placeholder.js
-
 // Athena
 // =require ucf-athena-framework/dist/js/framework.min.js
 
@@ -257,8 +255,6 @@ const enableTooltips = function () {
 
 
 $(() => {
-  $('input, textarea').placeholder();
-
   jumpTo();
   toggleModalModifyObject();
   calendarSliders();

diff --git a/static_files/static/css/style.min.css b/static_files/static/css/style.min.css
diff --git a/static_files/static/fonts/fontawesome/fa-brands-400.eot b/static_files/static/fonts/fontawesome/fa-brands-400.eot
diff --git a/static_files/static/fonts/fontawesome/fa-brands-400.svg b/static_files/static/fonts/fontawesome/fa-brands-400.svg
diff --git a/static_files/static/fonts/fontawesome/fa-brands-400.ttf b/static_files/static/fonts/fontawesome/fa-brands-400.ttf
diff --git a/static_files/static/fonts/fontawesome/fa-brands-400.woff b/static_files/static/fonts/fontawesome/fa-brands-400.woff
diff --git a/static_files/static/fonts/fontawesome/fa-brands-400.woff2 b/static_files/static/fonts/fontawesome/fa-brands-400.woff2
diff --git a/static_files/static/fonts/fontawesome/fa-regular-400.eot b/static_files/static/fonts/fontawesome/fa-regular-400.eot
diff --git a/static_files/static/fonts/fontawesome/fa-regular-400.svg b/static_files/static/fonts/fontawesome/fa-regular-400.svg
diff --git a/static_files/static/fonts/fontawesome/fa-regular-400.ttf b/static_files/static/fonts/fontawesome/fa-regular-400.ttf
diff --git a/static_files/static/fonts/fontawesome/fa-regular-400.woff b/static_files/static/fonts/fontawesome/fa-regular-400.woff
diff --git a/static_files/static/fonts/fontawesome/fa-regular-400.woff2 b/static_files/static/fonts/fontawesome/fa-regular-400.woff2
diff --git a/static_files/static/fonts/fontawesome/fa-solid-900.eot b/static_files/static/fonts/fontawesome/fa-solid-900.eot
diff --git a/static_files/static/fonts/fontawesome/fa-solid-900.svg b/static_files/static/fonts/fontawesome/fa-solid-900.svg
diff --git a/static_files/static/fonts/fontawesome/fa-solid-900.ttf b/static_files/static/fonts/fontawesome/fa-solid-900.ttf
diff --git a/static_files/static/fonts/fontawesome/fa-solid-900.woff b/static_files/static/fonts/fontawesome/fa-solid-900.woff
diff --git a/static_files/static/fonts/fontawesome/fa-solid-900.woff2 b/static_files/static/fonts/fontawesome/fa-solid-900.woff2
diff --git a/static_files/static/js/script-manager.min.js b/static_files/static/js/script-manager.min.js
diff --git a/static_files/static/js/script.min.js b/static_files/static/js/script.min.js