magento#13685: * Updating jQuery, jQuery UI (originally from npm), jQ…

…uery Migrate from online builder
morozov-group · Mar 3, 2019 · fc47098 · fc47098
1 parent f4c1d75
commit fc47098
Show file tree

Hide file tree

Showing 9 changed files with 25,241 additions and 22,233 deletions.
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
@@ -608,7 +608,7 @@ define([
             }).css('display', 'none');
             fu.parent().append(tmpInput);
             fileUploader = $(tmpInput).fileupload();
-            fileUploader.fileupload('send', data).success(function (result, textStatus, jqXHR) {
+            fileUploader.fileupload('send', data).done(function (result, textStatus, jqXHR) {
                 tmpInput.remove();
                 callback.call(null, result, textStatus, jqXHR);
             });

diff --git a/app/code/Magento/Theme/view/adminhtml/requirejs-config.js b/app/code/Magento/Theme/view/adminhtml/requirejs-config.js
@@ -56,6 +56,6 @@ var config = {
         'mage/adminhtml/globals'
     ],
     'paths': {
-        'jquery/ui': 'jquery/jquery-ui-1.9.2'
+        'jquery/ui': 'jquery/jquery-ui'
     }
 };
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
@@ -337,7 +337,7 @@ define([
          * Set z-index and margin for modal and overlay.
          */
         _setActive: function () {
-            var zIndex = this.modal.zIndex(),
+            var zIndex = this.modal.css('zIndex'),
                 baseIndex = zIndex + this._getVisibleCount();
 
             if (this.modal.data('active')) {
@@ -346,9 +346,9 @@ define([
 
             this.modal.data('active', true);
 
-            this.overlay.zIndex(++baseIndex);
-            this.prevOverlayIndex = this.overlay.zIndex();
-            this.modal.zIndex(this.overlay.zIndex() + 1);
+            this.overlay.css('zIndex', ++baseIndex);
+            this.prevOverlayIndex = this.overlay.css('zIndex');
+            this.modal.css('zIndex',this.overlay.css('zIndex') + 1);
 
             if (this._getVisibleSlideCount()) {
                 this.modal.css('marginLeft', this.options.modalLeftMargin * this._getVisibleSlideCount());
@@ -363,7 +363,7 @@ define([
             this.modal.data('active', false);
 
             if (this.overlay) {
-                this.overlay.zIndex(this.prevOverlayIndex - 1);
+                this.overlay.css('zIndex', this.prevOverlayIndex - 1);
             }
         },
 

diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -23,7 +23,7 @@ require.config({
         }
     },
     'paths': {
-        'jquery/ui': 'jquery/jquery-ui-1.9.2',
+        'jquery/ui': 'jquery/jquery-ui',
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',