no need to require jquery UI or jqote as both are bundled now.

jmturner · Jan 23, 2022 · 6883470 · 6883470
1 parent adb2e52
commit 6883470
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 31 deletions.
diff --git a/modules/base/src/reporting/v1/owa.js b/modules/base/src/reporting/v1/owa.js
@@ -46,22 +46,6 @@ var OWA = {
         return string;
     },
 
-    requireJs : function (name, url, callback) {
-
-        if ( ! this.isJsLoaded( name ) ) {
-            OWA.util.loadScript( url, callback );
-        }
-
-        this.loadedJsLibs[name] = url;
-    },
-
-    isJsLoaded : function( name ) {
-
-        if ( this.loadedJsLibs.hasOwnProperty( name ) ) {
-            return true;
-        }
-    },
-
     initializeStateManager: function() {
 
         if ( ! this.state.hasOwnProperty('init') ) {

diff --git a/modules/base/src/reporting/v1/owa.report.js b/modules/base/src/reporting/v1/owa.report.js
@@ -466,21 +466,8 @@ OWA.report.timePeriodControl = function( dom_id, options ) {
                         this.formatYyyymmdd(this.getEndDate(), '/')
                 );
 
-    if ( ! OWA.isJsLoaded( 'jquery-ui') ) {
-
-        OWA.requireJs( 
-            'jquery-ui', 
-            OWA.getOption('modules_url') + 'base/js/includes/jquery/jquery-ui-1.8.12.custom.min.js', 
-            OWA.requireJs(
-                'jqote', 
-                OWA.getOption('modules_url') + 'base/js/includes/jquery/jQote2/jquery.jqote2.min.js',
-                this.setupDomElements()
-            )
-        );
-
-    } else {
-        this.setupDomElements();
-    }
+    this.setupDomElements();
+
 };
 
 OWA.report.timePeriodControl.prototype = {