Bläddra i källkod

HUE-9287 [frontend] Upgrade jQuery to 3.5

Johan Ahlen 5 år sedan
förälder
incheckning
bdc2527840

+ 1 - 1
apps/rdbms/src/rdbms/templates/execute.mako

@@ -823,7 +823,7 @@ ${ commonshare() | n,unicode }
 
   // Initial htmlEscape
   String.prototype.htmlEscape = function() {
-    return $('<div/>').text(this.toString()).html();
+    return $('<div></div>').text(this.toString()).html();
   };
 
   var dataTable = null;

+ 1 - 1
desktop/core/src/desktop/js/apps/notebook2/components/resultGrid/ko.resultDownloadModal.js

@@ -159,7 +159,7 @@ componentUtils.registerComponent(NAME, undefined, TEMPLATE).then(() => {
     const $downloadProgressModal = $(
       '<div id="downloadProgressModal" data-bind="component: { name: \'' +
         NAME +
-        '\', params: $data }" data-keyboard="true" class="modal hide fade downloadProgressModal" tabindex="-1"/>'
+        '\', params: $data }" data-keyboard="true" class="modal hide fade downloadProgressModal" tabindex="-1"></div>'
     );
     $('body').append($downloadProgressModal);
 

+ 1 - 1
desktop/core/src/desktop/js/jquery/plugins/jquery.scrollleft.js

@@ -58,7 +58,7 @@ Plugin.prototype.setupScrollLeft = function() {
     link = $('#jHueScrollLeftAnchor');
     $(document).off('click', '#jHueScrollLeftAnchor');
   } else {
-    link = $('<a/>')
+    link = $('<a></a>')
       .attr('id', 'jHueScrollLeftAnchor')
       .addClass('hueAnchor hueAnchorScroller')
       .attr('href', 'javascript:void(0)')

+ 1 - 1
desktop/core/src/desktop/js/jquery/plugins/jquery.scrollup.js

@@ -61,7 +61,7 @@ Plugin.prototype.setupScrollUp = function() {
     link = $('#jHueScrollUpAnchor');
     $(document).off('click', '#jHueScrollUpAnchor');
   } else {
-    link = $('<a/>')
+    link = $('<a></a>')
       .attr('id', 'jHueScrollUpAnchor')
       .addClass('hueAnchor hueAnchorScroller')
       .attr('href', 'javascript:void(0)')

+ 1 - 1
desktop/core/src/desktop/js/ko/bindings/ko.autocomplete.js

@@ -113,7 +113,7 @@ ko.bindingHandlers.autocomplete = {
               .data('ui-autocomplete-item', item);
             ko.applyBindings(item, $li[0]);
           } else if (item.divider) {
-            $('<li/>')
+            $('<li></li>')
               .addClass(this.options.classPrefix + 'autocomplete-divider')
               .appendTo(ul);
           } else {

+ 1 - 1
desktop/core/src/desktop/js/ko/components/contextPopover/ko.contextPopover.js

@@ -862,7 +862,7 @@ componentUtils
     huePubSub.subscribe(SHOW_CONTEXT_POPOVER_EVENT, details => {
       hidePopover();
       const $contextPopover = $(
-        '<div id="contextPopover" data-bind="component: { name: \'context-popover\', params: $data }" />'
+        '<div id="contextPopover" data-bind="component: { name: \'context-popover\', params: $data }" ></div>'
       );
       $('body').append($contextPopover);
       ko.applyBindings(details, $contextPopover[0]);

+ 1 - 1
desktop/core/src/desktop/js/ko/components/doc/ko.shareDocModal.js

@@ -214,7 +214,7 @@ componentUtils.registerComponent('share-doc-modal', ShareDocModal, TEMPLATE).the
     }
 
     $shareDocMocal = $(
-      '<div id="shareDocModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'share-doc-modal\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"/>'
+      '<div id="shareDocModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'share-doc-modal\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"></div>'
     );
     $('body').append($shareDocMocal);
 

+ 1 - 1
desktop/core/src/desktop/js/ko/components/ko.createDirectoryModal.js

@@ -66,7 +66,7 @@ componentUtils.registerComponent('create-directory', undefined, TEMPLATE).then((
     };
 
     $createDirectoryModal = $(
-      '<div id="createDirectoryModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'create-directory\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"/>'
+      '<div id="createDirectoryModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'create-directory\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"></div>'
     );
     $('body').append($createDirectoryModal);
 

+ 1 - 1
desktop/core/src/desktop/js/ko/components/ko.deleteDocModal.js

@@ -94,7 +94,7 @@ componentUtils.registerComponent('delete-entry', undefined, TEMPLATE).then(() =>
     };
 
     $deleteEntriesModal = $(
-      '<div id="deleteEntriesModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'delete-entry\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"/>'
+      '<div id="deleteEntriesModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'delete-entry\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"></div>'
     );
     $('body').append($deleteEntriesModal);
 

+ 1 - 1
desktop/core/src/desktop/js/ko/components/ko.importDocumentsModal.js

@@ -168,7 +168,7 @@ componentUtils.registerComponent('import-documents-modal', undefined, TEMPLATE).
     huePubSub.publish(HIDE_EVENT);
 
     const $importDocumentsModal = $(
-      '<div id="importDocumentsModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'import-documents-modal\', params: params }" data-keyboard="true" class="modal hide fade fileupload-modal" tabindex="-1"/>'
+      '<div id="importDocumentsModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'import-documents-modal\', params: params }" data-keyboard="true" class="modal hide fade fileupload-modal" tabindex="-1"></div>'
     );
     $('body').append($importDocumentsModal);
 

+ 1 - 1
desktop/core/src/desktop/js/ko/components/ko.sessionAuthModal.js

@@ -124,7 +124,7 @@ componentUtils.registerComponent('session-auth-modal', undefined, TEMPLATE).then
     }
 
     $sessionAuthModal = $(
-      '<div id="sessionAuthModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'session-auth-modal\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"/>'
+      '<div id="sessionAuthModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'session-auth-modal\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"></div>'
     );
     $('body').append($sessionAuthModal);
 

+ 1 - 1
desktop/core/src/desktop/js/ko/components/ko.shareGistModal.js

@@ -56,7 +56,7 @@ componentUtils.registerComponent('share-gist-modal', undefined, TEMPLATE).then((
     }
 
     $shareGistModal = $(
-      '<div id="shareGistModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'share-gist-modal\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"/>'
+      '<div id="shareGistModal" data-bind="descendantsComplete: descendantsComplete, component: { name: \'share-gist-modal\', params: params }" data-keyboard="true" class="modal hide fade" tabindex="-1"></div>'
     );
     $('body').append($shareGistModal);
 

+ 3 - 3
desktop/core/src/desktop/js/utils/hueUtils.js

@@ -84,13 +84,13 @@ export const text2Url = selectors => {
  * @return {*|jQuery}
  */
 export const htmlEncode = value => {
-  return $('<div/>')
+  return $('<div></div>')
     .text(value)
     .html();
 };
 
 export const html2text = value => {
-  return $('<div/>')
+  return $('<div></div>')
     .html(value)
     .text()
     .replace(/\u00A0/g, ' ');
@@ -261,7 +261,7 @@ export const waitForVariable = (variable, callback, timeout) => {
 };
 
 export const scrollbarWidth = () => {
-  const $parent = $('<div style="width:50px;height:50px;overflow:auto"><div/></div>').appendTo(
+  const $parent = $('<div style="width:50px;height:50px;overflow:auto"><div></div></div>').appendTo(
     'body'
   );
   const $children = $parent.children();

+ 1 - 1
desktop/core/src/desktop/templates/sql_syntax_dropdown.mako

@@ -119,7 +119,7 @@ from django.utils.translation import ugettext as _
 
       huePubSub.subscribe('sql.syntax.dropdown.show', function (details) {
         hideSyntaxDropdown();
-        var $sqlSyntaxDropdown = $('<div id="sqlSyntaxDropdown" data-bind="component: { name: \'sql-syntax-dropdown\', params: $data }" />');
+        var $sqlSyntaxDropdown = $('<div id="sqlSyntaxDropdown" data-bind="component: { name: \'sql-syntax-dropdown\', params: $data }"></div>');
         $('body').append($sqlSyntaxDropdown);
         ko.applyBindings(details, $sqlSyntaxDropdown[0]);
       });

+ 6 - 6
package-lock.json

@@ -10094,9 +10094,9 @@
       "dev": true
     },
     "jquery": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz",
+      "integrity": "sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ=="
     },
     "jquery-contextmenu": {
       "version": "2.9.0",
@@ -15918,9 +15918,9 @@
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",

+ 1 - 1
package.json

@@ -34,7 +34,7 @@
     "d3v3": "1.0.3",
     "dropzone": "5.5.1",
     "filesize": "4.0.0",
-    "jquery": "^3.4.1",
+    "jquery": "3.5.0",
     "jquery-form": "4.2.2",
     "jquery-mousewheel": "3.1.13",
     "jquery-ui": "1.12.1",