Merge pull request #94 from aleevas/DS-1300

[Ds-1300] Fix deprecation code (once and cookie) in js files
YCloudYUSA · Jan 12, 2024 · 5eceb28 · 5eceb28
2 parents 56f5d96 + 2eb4a0e
commit 5eceb28
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/modules/openy_gc_auth/js/auth.behaviors.js b/modules/openy_gc_auth/js/auth.behaviors.js
@@ -1,4 +1,4 @@
-(function ($, Drupal) {
+(function ($, Drupal, cookies) {
  Drupal.behaviors.openy_gc_auth_store_hash = {
    attach: function (context) {
      // Only run this script on full documents, not ajax requests.
@@ -8,7 +8,7 @@
      if (!window.location.hash || window.location.hash === '#') {
        return;
      }
-     $.cookie('openy_gc_auth_destination', window.location.hash);
+     cookies.set('openy_gc_auth_destination', window.location.hash);
    }
  }
-})(jQuery, Drupal);
+})(jQuery, Drupal, window.Cookies);
diff --git a/modules/openy_gc_auth/modules/openy_gc_auth_example/js/openy_gc_auth_example.js b/modules/openy_gc_auth/modules/openy_gc_auth_example/js/openy_gc_auth_example.js
@@ -2,12 +2,13 @@
  * @file
  * JavaScript for openy_gc_auth_example.
  */
-(function ($, Drupal) {
+(function ($, Drupal, once) {
 
   Drupal.behaviors.openy_gc_auth_example = {
     attach: function(context, settings) {
-      $('input[data-autosubmit=1]', context).once('openy_gc_auth_example').form().submit();
+      $(once('openy_gc_auth-data-autosubmit', 'input[data-autosubmit=1]'))
+        .form().submit();
     }
   };
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);
diff --git a/modules/openy_gc_auth/modules/openy_gc_auth_example/openy_gc_auth_example.libraries.yml b/modules/openy_gc_auth/modules/openy_gc_auth_example/openy_gc_auth_example.libraries.yml
@@ -1,6 +1,7 @@
 openy_gc_auth_example:
-  version: 1.0
+  version: 1.1
   js:
     js/openy_gc_auth_example.js: { minified: false }
   dependencies:
     - core/jquery
+    - core/once
diff --git a/modules/openy_gc_auth/openy_gc_auth.libraries.yml b/modules/openy_gc_auth/openy_gc_auth.libraries.yml
@@ -1,7 +1,7 @@
 auth_destination:
-  version: 0.1
+  version: 0.2
   js:
     js/auth.behaviors.js: {}
   dependencies:
     - core/jquery
-    - core/jquery.cookie
+    - core/js-cookie