diff --git a/core/misc/ajax.js b/core/misc/ajax.js index 88a80256c16fd8d4ac89cf7f890fdbfaa1428fc9..42187270748f620e46d6c3feeed31922061562bf 100644 --- a/core/misc/ajax.js +++ b/core/misc/ajax.js @@ -1195,4 +1195,4 @@ } }; -})(jQuery, this, Drupal, drupalSettings); +})(jQuery, window, Drupal, drupalSettings); diff --git a/core/misc/states.js b/core/misc/states.js index cdbcba61430fb0dc3ea529d570d742a7e4aaff1b..24374b625f7a192010b73fdacf4b9d7403d45592 100644 --- a/core/misc/states.js +++ b/core/misc/states.js @@ -3,7 +3,7 @@ * Drupal's states library. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -721,4 +721,4 @@ } } -})(jQuery); +})(jQuery, Drupal); diff --git a/core/misc/timezone.js b/core/misc/timezone.js index f1ba7c928d6a623155ce43090a62b2cc0b2763e1..3c88d463dd805ae5a3f83bac4a62c778baf14712 100644 --- a/core/misc/timezone.js +++ b/core/misc/timezone.js @@ -3,7 +3,7 @@ * Timezone detection. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -73,4 +73,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/misc/vertical-tabs.js b/core/misc/vertical-tabs.js index 51038bc28a9fc08f8ad04fdecf6bee92cfc89a60..c7ad2fd2b44b1b15058ab5520fa082da5b450c5c 100644 --- a/core/misc/vertical-tabs.js +++ b/core/misc/vertical-tabs.js @@ -12,7 +12,7 @@ * @event summaryUpdated */ -(function ($) { +(function ($, Drupal, drupalSettings) { 'use strict'; @@ -249,4 +249,4 @@ return tab; }; -})(jQuery); +})(jQuery, Drupal, drupalSettings); diff --git a/core/modules/block/js/block.js b/core/modules/block/js/block.js index b3c8c31c3b0824b4f24e782247b97acb34b5109a..b9fced18944963ffe39541dd1ab117014eebb5db 100644 --- a/core/modules/block/js/block.js +++ b/core/modules/block/js/block.js @@ -3,7 +3,7 @@ * Block behaviors. */ -(function ($, window) { +(function ($, window, Drupal) { 'use strict'; @@ -20,7 +20,7 @@ // The drupalSetSummary method required for this behavior is not available // on the Blocks administration page, so we need to make sure this // behavior is processed only if drupalSetSummary is defined. - if (typeof jQuery.fn.drupalSetSummary === 'undefined') { + if (typeof $.fn.drupalSetSummary === 'undefined') { return; } @@ -218,4 +218,4 @@ } }; -})(jQuery, window); +})(jQuery, window, Drupal); diff --git a/core/modules/block_content/js/block_content.js b/core/modules/block_content/js/block_content.js index dbc89f9a8ab9496cb85227778114c56fcfff4294..bbc0533b2a35f40bc7c0cc974f608f6035468f0e 100644 --- a/core/modules/block_content/js/block_content.js +++ b/core/modules/block_content/js/block_content.js @@ -3,7 +3,7 @@ * Defines Javascript behaviors for the block_content module. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -54,4 +54,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/book/book.js b/core/modules/book/book.js index fa408181210f8205dc48400a7dcee0d008a20cb1..2cc788126479f4baf475416aa477bbb5fe88f478 100644 --- a/core/modules/book/book.js +++ b/core/modules/book/book.js @@ -3,7 +3,7 @@ * Javascript behaviors for the Book module. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -34,4 +34,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/ckeditor/js/ckeditor.admin.js b/core/modules/ckeditor/js/ckeditor.admin.js index 7adc9b1e43b4d8d83c7e81156a50c5a0ddf6be72..27f80b98b1aa91fd9034350214cf241ca61f759a 100644 --- a/core/modules/ckeditor/js/ckeditor.admin.js +++ b/core/modules/ckeditor/js/ckeditor.admin.js @@ -3,7 +3,7 @@ * CKEditor button and group configuration user interface. */ -(function ($, Drupal, _, CKEDITOR) { +(function ($, Drupal, drupalSettings, _) { 'use strict'; @@ -496,4 +496,4 @@ return '
  • '; }; -})(jQuery, Drupal, _, CKEDITOR); +})(jQuery, Drupal, drupalSettings, _); diff --git a/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js b/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js index 5b8ad4a27fcf2c147e758d3bf83714fbbe4789d3..c425dbb3002829de0633df15e51b42c7c3d369ba 100644 --- a/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js +++ b/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js @@ -3,7 +3,7 @@ * CKEditor StylesCombo admin behavior. */ -(function ($, Drupal, drupalSettings) { +(function ($, Drupal, drupalSettings, _) { 'use strict'; @@ -125,4 +125,4 @@ } }; -})(jQuery, Drupal, drupalSettings); +})(jQuery, Drupal, drupalSettings, _); diff --git a/core/modules/ckeditor/js/views/ControllerView.js b/core/modules/ckeditor/js/views/ControllerView.js index 8d215a1a7eb7e49c6dcd2829e997d34009702763..e6cbe24b8d2f3055d1ede120f79bb04eaa44053e 100644 --- a/core/modules/ckeditor/js/views/ControllerView.js +++ b/core/modules/ckeditor/js/views/ControllerView.js @@ -3,7 +3,7 @@ * A Backbone View acting as a controller for CKEditor toolbar configuration. */ -(function (Drupal, Backbone, $) { +(function ($, Drupal, Backbone, CKEDITOR, _) { 'use strict'; @@ -380,4 +380,4 @@ } }); -})(Drupal, Backbone, jQuery); +})(jQuery, Drupal, Backbone, CKEDITOR, _); diff --git a/core/modules/ckeditor/js/views/KeyboardView.js b/core/modules/ckeditor/js/views/KeyboardView.js index 27d6c8897c612eca4498344953852d1245a9592d..9f2ab5b28bccea36f5996ae1fb73ef9e1323770d 100644 --- a/core/modules/ckeditor/js/views/KeyboardView.js +++ b/core/modules/ckeditor/js/views/KeyboardView.js @@ -3,7 +3,7 @@ * Backbone View providing the aural view of CKEditor keyboard UX configuration. */ -(function (Drupal, Backbone, $) { +(function ($, Drupal, Backbone, _) { 'use strict'; @@ -263,4 +263,4 @@ } }); -})(Drupal, Backbone, jQuery); +})(jQuery, Drupal, Backbone, _); diff --git a/core/modules/color/color.js b/core/modules/color/color.js index ed68732fabf6ed8cee91ff006d18a7f61063750c..984f740126d49a86479a59ea890acd4ef6fa8108 100644 --- a/core/modules/color/color.js +++ b/core/modules/color/color.js @@ -3,7 +3,7 @@ * Attaches the behaviors for the Color module. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -294,4 +294,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/color/preview.js b/core/modules/color/preview.js index 0796ee908615b7f1258538ae1e4e87570b6043e6..38c62aef2679e43f42da14ef6e6ef144800d9aba 100644 --- a/core/modules/color/preview.js +++ b/core/modules/color/preview.js @@ -3,7 +3,7 @@ * Attaches preview-related behavior for the Color module. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -71,4 +71,4 @@ } } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/comment/comment-entity-form.js b/core/modules/comment/comment-entity-form.js index 3ad1a3d7411fe90c96ea1fd1ee746f8fd9310945..fd16d8bfb0e48c16e9bc60f656bc9936f3621c4c 100644 --- a/core/modules/comment/comment-entity-form.js +++ b/core/modules/comment/comment-entity-form.js @@ -3,7 +3,7 @@ * Attaches comment behaviors to the entity form. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -20,4 +20,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/comment/js/node-new-comments-link.js b/core/modules/comment/js/node-new-comments-link.js index 54506d95c4443a871f7cfa8ec317bec75bf4e73f..291bcbd11613a104e4fbd11c2931e4e3325269eb 100644 --- a/core/modules/comment/js/node-new-comments-link.js +++ b/core/modules/comment/js/node-new-comments-link.js @@ -6,7 +6,7 @@ * installed. */ -(function ($, Drupal) { +(function ($, Drupal, drupalSettings) { 'use strict'; @@ -174,4 +174,4 @@ } } -})(jQuery, Drupal); +})(jQuery, Drupal, drupalSettings); diff --git a/core/modules/editor/js/editor.formattedTextEditor.js b/core/modules/editor/js/editor.formattedTextEditor.js index 3efbaa2cb8d1a7f4343851dceae277bd2c9a4ae6..fec73e03a0bffa1a9c6dbdb81e8c43659659c477 100644 --- a/core/modules/editor/js/editor.formattedTextEditor.js +++ b/core/modules/editor/js/editor.formattedTextEditor.js @@ -11,7 +11,7 @@ * - Drupal.editors.magical.attachInlineEditor() */ -(function ($, Drupal, drupalSettings) { +(function ($, Drupal, drupalSettings, _) { 'use strict'; @@ -228,4 +228,4 @@ }); -})(jQuery, Drupal, drupalSettings); +})(jQuery, Drupal, drupalSettings, _); diff --git a/core/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js index 8010671631660ccc89cda7765fdf3fa45bc91782..31e0582c18993e5a5393d22e06e170ab26ef9440 100644 --- a/core/modules/filter/filter.admin.js +++ b/core/modules/filter/filter.admin.js @@ -3,7 +3,7 @@ * Attaches administration-specific behavior for the Filter module. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -66,4 +66,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/filter/filter.filter_html.admin.js b/core/modules/filter/filter.filter_html.admin.js index 8c9cef64f3a2bcf6ec54984d9479ce13efa7075b..7ddca90bba847fb3871df55c25f9c0539623ee7a 100644 --- a/core/modules/filter/filter.filter_html.admin.js +++ b/core/modules/filter/filter.filter_html.admin.js @@ -3,7 +3,7 @@ * Attaches behavior for updating filter_html's settings automatically. */ -(function ($, _, document, window) { +(function ($, Drupal, _, document) { 'use strict'; @@ -325,4 +325,4 @@ return html; }; -})(jQuery, _, document, window); +})(jQuery, Drupal, _, document); diff --git a/core/modules/filter/filter.js b/core/modules/filter/filter.js index 2455b7fec50347197052ed6bb76d1d2734c3ee58..b79104733edcd927db8adedac6b0604630a30207 100644 --- a/core/modules/filter/filter.js +++ b/core/modules/filter/filter.js @@ -3,7 +3,7 @@ * Attaches behavior for the Filter module. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -36,4 +36,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/menu_ui/menu_ui.admin.js b/core/modules/menu_ui/menu_ui.admin.js index 2bc80dd2d204adb535dafac17eabada1416435e8..345138f17a47c5ee1e25fba87d0f806b3ee920f1 100644 --- a/core/modules/menu_ui/menu_ui.admin.js +++ b/core/modules/menu_ui/menu_ui.admin.js @@ -3,7 +3,7 @@ * Menu UI admin behaviors. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -65,4 +65,4 @@ }); }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/menu_ui/menu_ui.js b/core/modules/menu_ui/menu_ui.js index 113b90a7db953ffbf7701b48845e2f29157cf53a..5eb10e0781c8f0fb605f3730f5e33b62a75752b4 100644 --- a/core/modules/menu_ui/menu_ui.js +++ b/core/modules/menu_ui/menu_ui.js @@ -3,7 +3,7 @@ * Menu UI behaviors. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -88,4 +88,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/node/content_types.js b/core/modules/node/content_types.js index 96733a214a26a90912a44f5e49580e48253fea99..eed93f01c92754e98dc17bca0ff270403da7c3ce 100644 --- a/core/modules/node/content_types.js +++ b/core/modules/node/content_types.js @@ -3,7 +3,7 @@ * Javascript for the node content editing form. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -59,4 +59,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/path/path.js b/core/modules/path/path.js index 4cca889b1df0a04542e16dc362e96001caf12858..dfa2c052a1af0f627cf30a70e5260a24808f2568 100644 --- a/core/modules/path/path.js +++ b/core/modules/path/path.js @@ -2,7 +2,7 @@ * @file * Attaches behaviors for the Path module. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -26,4 +26,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/quickedit/js/editors/formEditor.js b/core/modules/quickedit/js/editors/formEditor.js index 49fc6f0cd20c172d457205d9051a56d660f81744..374e5c21eba4338fb2e8210203adf31a69420f97 100644 --- a/core/modules/quickedit/js/editors/formEditor.js +++ b/core/modules/quickedit/js/editors/formEditor.js @@ -3,7 +3,7 @@ * Form-based in-place editor. Works for any field type. */ -(function ($, Drupal) { +(function ($, Drupal, _) { 'use strict'; @@ -252,4 +252,4 @@ } }); -})(jQuery, Drupal); +})(jQuery, Drupal, _); diff --git a/core/modules/quickedit/js/models/BaseModel.js b/core/modules/quickedit/js/models/BaseModel.js index f1c31d79713aa75250acaa0c88ff1f9590155ce0..7579b6f03b0d92de443eddb250b5be8fd611567a 100644 --- a/core/modules/quickedit/js/models/BaseModel.js +++ b/core/modules/quickedit/js/models/BaseModel.js @@ -3,7 +3,7 @@ * A Backbone Model subclass that enforces validation when calling set(). */ -(function (Backbone) { +(function (Drupal, Backbone) { 'use strict'; @@ -57,4 +57,4 @@ }); -}(Backbone)); +}(Drupal, Backbone)); diff --git a/core/modules/simpletest/simpletest.js b/core/modules/simpletest/simpletest.js index dfe5fba3c67a5a8f3fa43eb3bcfd8fa256140b8d..ba54cbf74b35625da5ff33d2375667597f28ccdb 100644 --- a/core/modules/simpletest/simpletest.js +++ b/core/modules/simpletest/simpletest.js @@ -3,7 +3,7 @@ * Simpletest behaviors. */ -(function ($) { +(function ($, Drupal, drupalSettings) { 'use strict'; @@ -127,4 +127,4 @@ } }; -})(jQuery); +})(jQuery, Drupal, drupalSettings); diff --git a/core/modules/taxonomy/taxonomy.js b/core/modules/taxonomy/taxonomy.js index 09e5b464b2d3c71a2472b52f0585a13fc9089e31..99338d5a8ec29d2427adbf55cebd19881d9b6be9 100644 --- a/core/modules/taxonomy/taxonomy.js +++ b/core/modules/taxonomy/taxonomy.js @@ -3,7 +3,7 @@ * Taxonomy behaviors. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -53,4 +53,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/text/text.js b/core/modules/text/text.js index 615a1e60193ea748a6e4f16cfcaed05b80716ab4..ad89bd8ad1619b656d7992fd5c84382b9a532096 100644 --- a/core/modules/text/text.js +++ b/core/modules/text/text.js @@ -3,7 +3,7 @@ * Text behaviors. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -58,4 +58,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/user/user.permissions.js b/core/modules/user/user.permissions.js index ec90b38372b3503285a58c12c4e647927a10130c..c3dc24f1f0a6c210734095b43b578bedd79059a3 100644 --- a/core/modules/user/user.permissions.js +++ b/core/modules/user/user.permissions.js @@ -3,7 +3,7 @@ * User permission page behaviors. */ -(function ($) { +(function ($, Drupal) { 'use strict'; @@ -85,4 +85,4 @@ } }; -})(jQuery); +})(jQuery, Drupal); diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js index b3a8ace5040bd0b2c0704b54c5fc3eb45cea487e..ad61000c05fd79750377cd169a262fcd1a3fb3fb 100644 --- a/core/modules/views/js/ajax_view.js +++ b/core/modules/views/js/ajax_view.js @@ -85,20 +85,20 @@ // Add the ajax to exposed forms. this.$exposed_form = $('form#views-exposed-form-' + settings.view_name.replace(/_/g, '-') + '-' + settings.view_display_id.replace(/_/g, '-')); - this.$exposed_form.once('exposed-form').each(jQuery.proxy(this.attachExposedFormAjax, this)); + this.$exposed_form.once('exposed-form').each($.proxy(this.attachExposedFormAjax, this)); // Add the ajax to pagers. this.$view // Don't attach to nested views. Doing so would attach multiple behaviors // to a given element. - .filter(jQuery.proxy(this.filterNestedViews, this)) - .once('ajax-pager').each(jQuery.proxy(this.attachPagerAjax, this)); + .filter($.proxy(this.filterNestedViews, this)) + .once('ajax-pager').each($.proxy(this.attachPagerAjax, this)); // Add a trigger to update this view specifically. In order to trigger a // refresh use the following code. // // @code - // jQuery('.view-name').trigger('RefreshView'); + // $('.view-name').trigger('RefreshView'); // @endcode var self_settings = $.extend({}, this.element_settings, { event: 'RefreshView', @@ -140,7 +140,7 @@ */ Drupal.views.ajaxView.prototype.attachPagerAjax = function () { this.$view.find('ul.js-pager__items > li > a, th.views-field a, .attachment .views-summary a') - .each(jQuery.proxy(this.attachPagerLinkAjax, this)); + .each($.proxy(this.attachPagerLinkAjax, this)); }; /**