Merge branch 'release-7.9.0'

oat-sa · Feb 1, 2024 · 1264801 · 1264801
2 parents fa495d2 + 9c00de4
commit 1264801
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/views/js/loader/taoGroups.min.js b/views/js/loader/taoGroups.min.js
diff --git a/views/js/loader/taoGroups.min.js.map b/views/js/loader/taoGroups.min.js.map
diff --git a/views/js/provider/group.js b/views/js/provider/group.js
@@ -18,7 +18,7 @@
  * @author Alexander Zagovorichev <[email protected]>
  */
 
-define(['jquery', 'lodash', 'i18n', 'util/url', 'core/promise', 'core/request'], function ($, _, __, urlUtil, Promise, coreRequest) {
+define(['jquery', 'i18n', 'util/url', 'core/promise', 'core/request'], function ($, __, urlUtil, Promise, coreRequest) {
     'use strict';
 
     /**
@@ -52,7 +52,7 @@ define(['jquery', 'lodash', 'i18n', 'util/url', 'core/promise', 'core/request'],
                     type: 'instance'
                 };
 
-                config = _.defaults(config || {}, _defaults);
+                config = Object.assign({}, _defaults, config);
 
                 return new Promise((resolve, reject) => {
                         coreRequest({
@@ -80,7 +80,7 @@ define(['jquery', 'lodash', 'i18n', 'util/url', 'core/promise', 'core/request'],
 
                 return new Promise((resolve, reject) => {
 
-                    if (!_.isString(uri) || _.isEmpty(uri)) {
+                    if (typeof uri !== 'string' || uri.trim() === '') {
                         return reject(new TypeError(__('Group uri is not valid')));
                     }