From 0d867eb0be22c258b42d87c5e1fbf6a96f0e2cd3 Mon Sep 17 00:00:00 2001
From: Tom Homer <tomhomer@gmail.com>
Date: Mon, 12 Dec 2016 16:15:22 -0500
Subject: [PATCH] Updated calls to Scripts class for jQuery UI

---
 plugins/calendar/functions.inc               | 5 ++---
 public_html/admin/plugins/calendar/index.php | 5 ++---
 public_html/admin/story.php                  | 5 +----
 public_html/lib-common.php                   | 8 ++------
 system/classes/config.class.php              | 4 +---
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/plugins/calendar/functions.inc b/plugins/calendar/functions.inc
index 03d0f8a49..9ae93a0b2 100644
--- a/plugins/calendar/functions.inc
+++ b/plugins/calendar/functions.inc
@@ -717,12 +717,11 @@ function plugin_submit_calendar($mode = 'master')
     // otherwise non-admin or admin-personal. do personal form or public submission.
 
     // Loads jQuery UI datepicker and timepicker-addon
-    $_SCRIPTS->setJavaScriptLibrary('jquery.ui.slider');
-    $_SCRIPTS->setJavaScriptLibrary('jquery.ui.datepicker');
+    $_SCRIPTS->setJavaScriptLibrary('jquery-ui'); // Require slider and date picker
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-i18n');
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-timepicker-addon');
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-timepicker-addon-i18n');
-    $_SCRIPTS->setJavaScriptFile('datetimepicker', '/javascript/datetimepicker.js');
+    $_SCRIPTS->setJavaScriptFile('datetimepicker', '/javascript/datetimepicker.js');    
 
     $langCode = COM_getLangIso639Code();
     $toolTip = $MESSAGE[118];
diff --git a/public_html/admin/plugins/calendar/index.php b/public_html/admin/plugins/calendar/index.php
index b99c90766..b87de67a9 100644
--- a/public_html/admin/plugins/calendar/index.php
+++ b/public_html/admin/plugins/calendar/index.php
@@ -79,12 +79,11 @@ function CALENDAR_editEvent ($mode, $A, $msg = '')
            $MESSAGE, $_SCRIPTS;
 
     // Loads jQuery UI datepicker and timepicker-addon
-    $_SCRIPTS->setJavaScriptLibrary('jquery.ui.slider');
-    $_SCRIPTS->setJavaScriptLibrary('jquery.ui.datepicker');
+    $_SCRIPTS->setJavaScriptLibrary('jquery-ui'); // Require slider and date picker
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-i18n');
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-timepicker-addon');
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-timepicker-addon-i18n');
-    $_SCRIPTS->setJavaScriptFile('datetimepicker', '/javascript/datetimepicker.js');
+    $_SCRIPTS->setJavaScriptFile('datetimepicker', '/javascript/datetimepicker.js');           
 
     // Add JavaScript
     $_SCRIPTS->setJavaScriptFile('postmode_control', '/javascript/postmode_control.js');
diff --git a/public_html/admin/story.php b/public_html/admin/story.php
index 0bb7f2846..38f1afe8c 100644
--- a/public_html/admin/story.php
+++ b/public_html/admin/story.php
@@ -769,13 +769,10 @@ function storyeditor($sid = '', $mode = '', $errormsg = '')
     $_SCRIPTS->setJavaScriptFile('postmode_control', '/javascript/postmode_control.js');
 
     // Loads jQuery UI datepicker and timepicker-addon
-    $_SCRIPTS->setJavaScriptLibrary('jquery.ui.slider');
-    //    $_SCRIPTS->setJavaScriptLibrary('jquery.ui.button');
-    $_SCRIPTS->setJavaScriptLibrary('jquery.ui.datepicker');
+    $_SCRIPTS->setJavaScriptLibrary('jquery-ui'); // Require slider and date picker
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-i18n');
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-timepicker-addon');
     $_SCRIPTS->setJavaScriptLibrary('jquery-ui-timepicker-addon-i18n');
-    //    $_SCRIPTS->setJavaScriptLibrary('jquery-ui-slideraccess');
     $_SCRIPTS->setJavaScriptFile('datetimepicker', '/javascript/datetimepicker.js');
 
     $langCode = COM_getLangIso639Code();
diff --git a/public_html/lib-common.php b/public_html/lib-common.php
index 40de34416..d85abba31 100755
--- a/public_html/lib-common.php
+++ b/public_html/lib-common.php
@@ -2050,12 +2050,8 @@ function COM_startBlock($title = '', $helpFile = '', $template = 'blockheader.th
             if (!defined('GL-HELP-SET')) {
                 define('GL-HELP-SET', true);
 
-                // Add in Query dialog for help file
-                $_SCRIPTS->setJavaScriptLibrary('jquery.ui.dialog');
-                $_SCRIPTS->setJavaScriptLibrary('jquery.ui.draggable');
-                $_SCRIPTS->setJavaScriptLibrary('jquery.ui.droppable');
-                $_SCRIPTS->setJavaScriptLibrary('jquery.ui.resizable');
-                $_SCRIPTS->setJavaScriptLibrary('jquery.ui.button');
+                // Add in jQuery dialog for help file
+                $_SCRIPTS->setJavaScriptLibrary('jquery-ui'); // Requires dialog, draggable, droppable, resizable, and button
 
                 // Add Language variables
                 $_SCRIPTS->setLang(array('close' => $LANG32[60]));
diff --git a/system/classes/config.class.php b/system/classes/config.class.php
index cedd45ecd..49765a8a2 100644
--- a/system/classes/config.class.php
+++ b/system/classes/config.class.php
@@ -1013,9 +1013,7 @@ public function get_ui($grp, $sg = '0', $change_result = null)
         $tab_li .= '</ul>';
         $t->set_var('tab_li', $tab_li);
 
-        $_SCRIPTS->setJavaScriptLibrary('jquery.ui.autocomplete');
-        $_SCRIPTS->setJavaScriptLibrary('jquery.ui.menu');  // Required by 'jquery.ui.autocomplete'
-        $_SCRIPTS->setJavaScriptLibrary('jquery.ui.tabs');
+        $_SCRIPTS->setJavaScriptLibrary('jquery-ui'); // Require autocomplete, menu, and tabs
 
         $t->set_var('config_menu', $this->_UI_configmanager_menu($grp, $sg));