From 6883470142e3bdd07b015dd127227c026859d1a3 Mon Sep 17 00:00:00 2001 From: padams Date: Sun, 23 Jan 2022 18:58:10 +0000 Subject: [PATCH] no need to require jquery UI or jqote as both are bundled now. --- modules/base/src/reporting/v1/owa.js | 16 ---------------- modules/base/src/reporting/v1/owa.report.js | 17 ++--------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/modules/base/src/reporting/v1/owa.js b/modules/base/src/reporting/v1/owa.js index 2fa541651..9b1e82c4d 100644 --- 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 index e6485262f..ac6eeb3f9 100644 --- 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 = {