diff --git a/core/includes/common.inc b/core/includes/common.inc index aea8529..cab7523 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -3622,8 +3622,8 @@ function drupal_region_class($region) { * * Examples: * @code - * drupal_add_js('core/misc/collapse.js'); - * drupal_add_js('core/misc/collapse.js', 'file'); + * drupal_add_js('core/modules/system/assets/collapse.js'); + * drupal_add_js('core/modules/system/assets/collapse.js', 'file'); * drupal_add_js('jQuery(document).ready(function () { alert("Hello!"); });', 'inline'); * drupal_add_js('jQuery(document).ready(function () { alert("Hello!"); });', * array('type' => 'inline', 'scope' => 'footer', 'weight' => 5) diff --git a/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php b/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php index 0763507..a7debea 100644 --- a/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php @@ -41,7 +41,7 @@ class DownloadTest extends FileManagedTestBase { // Test generating an URL to a shipped file (i.e. a file that is part of // Drupal core, a module or a theme, for example a JavaScript file). - $filepath = 'core/misc/jquery.js'; + $filepath = 'core/modules/system/assets/jquery.js'; $url = file_create_url($filepath); $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath, $url, t('Correctly generated a URL for a shipped file.')); $this->drupalHead($url); diff --git a/core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php b/core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php index eeaa47b..963a06d 100644 --- a/core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php @@ -27,7 +27,7 @@ class ValidatorTest extends FileManagedTestBase { $this->image->filename = drupal_basename($this->image->uri); $this->non_image = entity_create('file', array()); - $this->non_image->uri = 'core/misc/jquery.js'; + $this->non_image->uri = 'core/modules/system/assets/jquery.js'; $this->non_image->filename = drupal_basename($this->non_image->uri); } diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index dd5ee4d..31f5e7f 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -98,8 +98,8 @@ function simpletest_js_alter(&$javascript) { // Since SimpleTest is a special use case for the table select, stick the // SimpleTest JavaScript above the table select. $simpletest = drupal_get_path('module', 'simpletest') . '/simpletest.js'; - if (array_key_exists($simpletest, $javascript) && array_key_exists('core/misc/tableselect.js', $javascript)) { - $javascript[$simpletest]['weight'] = $javascript['core/misc/tableselect.js']['weight'] - 1; + if (array_key_exists($simpletest, $javascript) && array_key_exists('core/modules/system/assets/tableselect.js', $javascript)) { + $javascript[$simpletest]['weight'] = $javascript['core/modules/system/assets/tableselect.js']['weight'] - 1; } } diff --git a/core/misc/ajax.js b/core/modules/system/assets/ajax.js similarity index 100% rename from core/misc/ajax.js rename to core/modules/system/assets/ajax.js diff --git a/core/misc/autocomplete.js b/core/modules/system/assets/autocomplete.js similarity index 100% rename from core/misc/autocomplete.js rename to core/modules/system/assets/autocomplete.js diff --git a/core/misc/batch.js b/core/modules/system/assets/batch.js similarity index 100% rename from core/misc/batch.js rename to core/modules/system/assets/batch.js diff --git a/core/misc/collapse.js b/core/modules/system/assets/collapse.js similarity index 100% rename from core/misc/collapse.js rename to core/modules/system/assets/collapse.js diff --git a/core/misc/drupal.js b/core/modules/system/assets/drupal.js similarity index 100% rename from core/misc/drupal.js rename to core/modules/system/assets/drupal.js diff --git a/core/misc/farbtastic/farbtastic.css b/core/modules/system/assets/farbtastic/farbtastic.css similarity index 100% rename from core/misc/farbtastic/farbtastic.css rename to core/modules/system/assets/farbtastic/farbtastic.css diff --git a/core/misc/farbtastic/farbtastic.js b/core/modules/system/assets/farbtastic/farbtastic.js similarity index 100% rename from core/misc/farbtastic/farbtastic.js rename to core/modules/system/assets/farbtastic/farbtastic.js diff --git a/core/misc/farbtastic/marker.png b/core/modules/system/assets/farbtastic/marker.png similarity index 100% rename from core/misc/farbtastic/marker.png rename to core/modules/system/assets/farbtastic/marker.png diff --git a/core/misc/farbtastic/mask.png b/core/modules/system/assets/farbtastic/mask.png similarity index 100% rename from core/misc/farbtastic/mask.png rename to core/modules/system/assets/farbtastic/mask.png diff --git a/core/misc/farbtastic/wheel.png b/core/modules/system/assets/farbtastic/wheel.png similarity index 100% rename from core/misc/farbtastic/wheel.png rename to core/modules/system/assets/farbtastic/wheel.png diff --git a/core/misc/form.js b/core/modules/system/assets/form.js similarity index 100% rename from core/misc/form.js rename to core/modules/system/assets/form.js diff --git a/core/misc/html5.js b/core/modules/system/assets/html5.js similarity index 100% rename from core/misc/html5.js rename to core/modules/system/assets/html5.js diff --git a/core/misc/jquery.ba-bbq.js b/core/modules/system/assets/jquery.ba-bbq.js similarity index 100% rename from core/misc/jquery.ba-bbq.js rename to core/modules/system/assets/jquery.ba-bbq.js diff --git a/core/misc/jquery.form.js b/core/modules/system/assets/jquery.form.js similarity index 100% rename from core/misc/jquery.form.js rename to core/modules/system/assets/jquery.form.js diff --git a/core/misc/jquery.js b/core/modules/system/assets/jquery.js similarity index 100% rename from core/misc/jquery.js rename to core/modules/system/assets/jquery.js diff --git a/core/misc/jquery.once.js b/core/modules/system/assets/jquery.once.js similarity index 100% rename from core/misc/jquery.once.js rename to core/modules/system/assets/jquery.once.js diff --git a/core/misc/machine-name.js b/core/modules/system/assets/machine-name.js similarity index 100% rename from core/misc/machine-name.js rename to core/modules/system/assets/machine-name.js diff --git a/core/misc/progress.js b/core/modules/system/assets/progress.js similarity index 100% rename from core/misc/progress.js rename to core/modules/system/assets/progress.js diff --git a/core/misc/states.js b/core/modules/system/assets/states.js similarity index 100% rename from core/misc/states.js rename to core/modules/system/assets/states.js diff --git a/core/misc/tabledrag.js b/core/modules/system/assets/tabledrag.js similarity index 100% rename from core/misc/tabledrag.js rename to core/modules/system/assets/tabledrag.js diff --git a/core/misc/tableheader.js b/core/modules/system/assets/tableheader.js similarity index 100% rename from core/misc/tableheader.js rename to core/modules/system/assets/tableheader.js diff --git a/core/misc/tableresponsive.js b/core/modules/system/assets/tableresponsive.js similarity index 100% rename from core/misc/tableresponsive.js rename to core/modules/system/assets/tableresponsive.js diff --git a/core/misc/tableselect.js b/core/modules/system/assets/tableselect.js similarity index 100% rename from core/misc/tableselect.js rename to core/modules/system/assets/tableselect.js diff --git a/core/misc/timezone.js b/core/modules/system/assets/timezone.js similarity index 100% rename from core/misc/timezone.js rename to core/modules/system/assets/timezone.js diff --git a/core/misc/ui/AUTHORS.txt b/core/modules/system/assets/ui/AUTHORS.txt similarity index 100% rename from core/misc/ui/AUTHORS.txt rename to core/modules/system/assets/ui/AUTHORS.txt diff --git a/core/misc/ui/README.md b/core/modules/system/assets/ui/README.md similarity index 100% rename from core/misc/ui/README.md rename to core/modules/system/assets/ui/README.md diff --git a/core/misc/ui/external/globalize.culture.de-DE.js b/core/modules/system/assets/ui/external/globalize.culture.de-DE.js similarity index 100% rename from core/misc/ui/external/globalize.culture.de-DE.js rename to core/modules/system/assets/ui/external/globalize.culture.de-DE.js diff --git a/core/misc/ui/external/globalize.culture.ja-JP.js b/core/modules/system/assets/ui/external/globalize.culture.ja-JP.js similarity index 100% rename from core/misc/ui/external/globalize.culture.ja-JP.js rename to core/modules/system/assets/ui/external/globalize.culture.ja-JP.js diff --git a/core/misc/ui/external/globalize.js b/core/modules/system/assets/ui/external/globalize.js similarity index 100% rename from core/misc/ui/external/globalize.js rename to core/modules/system/assets/ui/external/globalize.js diff --git a/core/misc/ui/external/jquery.bgiframe-2.1.2.js b/core/modules/system/assets/ui/external/jquery.bgiframe-2.1.2.js similarity index 100% rename from core/misc/ui/external/jquery.bgiframe-2.1.2.js rename to core/modules/system/assets/ui/external/jquery.bgiframe-2.1.2.js diff --git a/core/misc/ui/external/jquery.cookie.js b/core/modules/system/assets/ui/external/jquery.cookie.js similarity index 100% rename from core/misc/ui/external/jquery.cookie.js rename to core/modules/system/assets/ui/external/jquery.cookie.js diff --git a/core/misc/ui/external/jquery.metadata.js b/core/modules/system/assets/ui/external/jquery.metadata.js similarity index 100% rename from core/misc/ui/external/jquery.metadata.js rename to core/modules/system/assets/ui/external/jquery.metadata.js diff --git a/core/misc/ui/external/jquery.mousewheel-3.0.4.js b/core/modules/system/assets/ui/external/jquery.mousewheel-3.0.4.js similarity index 100% rename from core/misc/ui/external/jquery.mousewheel-3.0.4.js rename to core/modules/system/assets/ui/external/jquery.mousewheel-3.0.4.js diff --git a/core/misc/ui/package.json b/core/modules/system/assets/ui/package.json similarity index 100% rename from core/misc/ui/package.json rename to core/modules/system/assets/ui/package.json diff --git a/core/misc/ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/core/misc/ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/core/misc/ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/core/misc/ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/core/misc/ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png diff --git a/core/misc/ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/core/misc/ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/core/misc/ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/core/modules/system/assets/ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to core/modules/system/assets/ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/core/misc/ui/themes/base/images/ui-icons_222222_256x240.png b/core/modules/system/assets/ui/themes/base/images/ui-icons_222222_256x240.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-icons_222222_256x240.png rename to core/modules/system/assets/ui/themes/base/images/ui-icons_222222_256x240.png diff --git a/core/misc/ui/themes/base/images/ui-icons_2e83ff_256x240.png b/core/modules/system/assets/ui/themes/base/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-icons_2e83ff_256x240.png rename to core/modules/system/assets/ui/themes/base/images/ui-icons_2e83ff_256x240.png diff --git a/core/misc/ui/themes/base/images/ui-icons_454545_256x240.png b/core/modules/system/assets/ui/themes/base/images/ui-icons_454545_256x240.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-icons_454545_256x240.png rename to core/modules/system/assets/ui/themes/base/images/ui-icons_454545_256x240.png diff --git a/core/misc/ui/themes/base/images/ui-icons_888888_256x240.png b/core/modules/system/assets/ui/themes/base/images/ui-icons_888888_256x240.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-icons_888888_256x240.png rename to core/modules/system/assets/ui/themes/base/images/ui-icons_888888_256x240.png diff --git a/core/misc/ui/themes/base/images/ui-icons_cd0a0a_256x240.png b/core/modules/system/assets/ui/themes/base/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from core/misc/ui/themes/base/images/ui-icons_cd0a0a_256x240.png rename to core/modules/system/assets/ui/themes/base/images/ui-icons_cd0a0a_256x240.png diff --git a/core/misc/ui/themes/base/jquery.ui.accordion.css b/core/modules/system/assets/ui/themes/base/jquery.ui.accordion.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.accordion.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.accordion.css diff --git a/core/misc/ui/themes/base/jquery.ui.all.css b/core/modules/system/assets/ui/themes/base/jquery.ui.all.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.all.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.all.css diff --git a/core/misc/ui/themes/base/jquery.ui.autocomplete.css b/core/modules/system/assets/ui/themes/base/jquery.ui.autocomplete.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.autocomplete.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.autocomplete.css diff --git a/core/misc/ui/themes/base/jquery.ui.base.css b/core/modules/system/assets/ui/themes/base/jquery.ui.base.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.base.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.base.css diff --git a/core/misc/ui/themes/base/jquery.ui.button.css b/core/modules/system/assets/ui/themes/base/jquery.ui.button.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.button.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.button.css diff --git a/core/misc/ui/themes/base/jquery.ui.core.css b/core/modules/system/assets/ui/themes/base/jquery.ui.core.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.core.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.core.css diff --git a/core/misc/ui/themes/base/jquery.ui.datepicker.css b/core/modules/system/assets/ui/themes/base/jquery.ui.datepicker.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.datepicker.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.datepicker.css diff --git a/core/misc/ui/themes/base/jquery.ui.dialog.css b/core/modules/system/assets/ui/themes/base/jquery.ui.dialog.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.dialog.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.dialog.css diff --git a/core/misc/ui/themes/base/jquery.ui.menu.css b/core/modules/system/assets/ui/themes/base/jquery.ui.menu.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.menu.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.menu.css diff --git a/core/misc/ui/themes/base/jquery.ui.progressbar.css b/core/modules/system/assets/ui/themes/base/jquery.ui.progressbar.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.progressbar.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.progressbar.css diff --git a/core/misc/ui/themes/base/jquery.ui.resizable.css b/core/modules/system/assets/ui/themes/base/jquery.ui.resizable.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.resizable.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.resizable.css diff --git a/core/misc/ui/themes/base/jquery.ui.selectable.css b/core/modules/system/assets/ui/themes/base/jquery.ui.selectable.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.selectable.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.selectable.css diff --git a/core/misc/ui/themes/base/jquery.ui.slider.css b/core/modules/system/assets/ui/themes/base/jquery.ui.slider.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.slider.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.slider.css diff --git a/core/misc/ui/themes/base/jquery.ui.spinner.css b/core/modules/system/assets/ui/themes/base/jquery.ui.spinner.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.spinner.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.spinner.css diff --git a/core/misc/ui/themes/base/jquery.ui.tabs.css b/core/modules/system/assets/ui/themes/base/jquery.ui.tabs.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.tabs.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.tabs.css diff --git a/core/misc/ui/themes/base/jquery.ui.theme.css b/core/modules/system/assets/ui/themes/base/jquery.ui.theme.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.theme.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.theme.css diff --git a/core/misc/ui/themes/base/jquery.ui.tooltip.css b/core/modules/system/assets/ui/themes/base/jquery.ui.tooltip.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.tooltip.css rename to core/modules/system/assets/ui/themes/base/jquery.ui.tooltip.css diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-af.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-af.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-af.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-af.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ar-DZ.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ar-DZ.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ar-DZ.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ar-DZ.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ar.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ar.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ar.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ar.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-az.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-az.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-az.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-az.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-bg.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-bg.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-bg.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-bg.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-bs.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-bs.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-bs.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-bs.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ca.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ca.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ca.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ca.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-cs.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-cs.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-cs.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-cs.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-cy-GB.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-cy-GB.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-cy-GB.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-cy-GB.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-da.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-da.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-da.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-da.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-de.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-de.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-de.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-de.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-el.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-el.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-el.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-el.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-en-AU.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-en-AU.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-en-AU.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-en-AU.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-en-GB.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-en-GB.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-en-GB.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-en-GB.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-en-NZ.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-en-NZ.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-en-NZ.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-en-NZ.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-eo.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-eo.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-eo.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-eo.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-es.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-es.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-es.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-es.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-et.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-et.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-et.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-et.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-eu.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-eu.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-eu.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-eu.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fa.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fa.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-fa.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fa.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fi.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fi.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-fi.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fi.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fo.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fo.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-fo.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fo.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fr-CH.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fr-CH.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-fr-CH.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fr-CH.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fr.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fr.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-fr.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-fr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ge.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ge.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ge.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ge.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-gl.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-gl.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-gl.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-gl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-he.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-he.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-he.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-he.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hi.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hi.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-hi.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hi.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hr.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hr.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-hr.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hu.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hu.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-hu.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hu.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hy.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hy.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-hy.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-hy.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-id.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-id.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-id.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-id.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-is.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-is.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-is.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-is.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-it.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-it.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-it.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-it.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ja.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ja.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ja.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ja.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ka.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ka.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ka.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ka.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-kk.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-kk.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-kk.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-kk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-km.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-km.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-km.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-km.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ko.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ko.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ko.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ko.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-lb.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-lb.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-lb.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-lb.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-lt.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-lt.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-lt.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-lt.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-lv.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-lv.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-lv.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-lv.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-mk.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-mk.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-mk.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-mk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ml.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ml.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ml.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ml.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ms.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ms.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ms.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ms.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-nl-BE.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-nl-BE.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-nl-BE.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-nl-BE.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-nl.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-nl.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-nl.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-nl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-no.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-no.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-no.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-no.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-pl.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-pl.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-pl.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-pl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-pt-BR.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-pt-BR.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-pt-BR.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-pt-BR.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-pt.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-pt.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-pt.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-pt.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-rm.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-rm.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-rm.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-rm.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ro.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ro.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ro.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ro.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ru.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ru.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ru.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ru.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sk.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sk.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-sk.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sl.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sl.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-sl.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sq.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sq.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-sq.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sq.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sr-SR.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sr-SR.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-sr-SR.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sr-SR.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sr.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sr.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-sr.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sv.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sv.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-sv.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-sv.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ta.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ta.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-ta.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-ta.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-th.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-th.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-th.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-th.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-tj.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-tj.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-tj.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-tj.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-tr.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-tr.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-tr.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-tr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-uk.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-uk.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-uk.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-uk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-vi.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-vi.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-vi.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-vi.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-zh-CN.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-zh-CN.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-zh-CN.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-zh-CN.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-zh-HK.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-zh-HK.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-zh-HK.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-zh-HK.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-zh-TW.js b/core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-zh-TW.js similarity index 100% rename from core/misc/ui/ui/i18n/jquery.ui.datepicker-zh-TW.js rename to core/modules/system/assets/ui/ui/i18n/jquery.ui.datepicker-zh-TW.js diff --git a/core/misc/ui/ui/jquery.effects.blind.js b/core/modules/system/assets/ui/ui/jquery.effects.blind.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.blind.js rename to core/modules/system/assets/ui/ui/jquery.effects.blind.js diff --git a/core/misc/ui/ui/jquery.effects.bounce.js b/core/modules/system/assets/ui/ui/jquery.effects.bounce.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.bounce.js rename to core/modules/system/assets/ui/ui/jquery.effects.bounce.js diff --git a/core/misc/ui/ui/jquery.effects.clip.js b/core/modules/system/assets/ui/ui/jquery.effects.clip.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.clip.js rename to core/modules/system/assets/ui/ui/jquery.effects.clip.js diff --git a/core/misc/ui/ui/jquery.effects.core.js b/core/modules/system/assets/ui/ui/jquery.effects.core.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.core.js rename to core/modules/system/assets/ui/ui/jquery.effects.core.js diff --git a/core/misc/ui/ui/jquery.effects.drop.js b/core/modules/system/assets/ui/ui/jquery.effects.drop.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.drop.js rename to core/modules/system/assets/ui/ui/jquery.effects.drop.js diff --git a/core/misc/ui/ui/jquery.effects.explode.js b/core/modules/system/assets/ui/ui/jquery.effects.explode.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.explode.js rename to core/modules/system/assets/ui/ui/jquery.effects.explode.js diff --git a/core/misc/ui/ui/jquery.effects.fade.js b/core/modules/system/assets/ui/ui/jquery.effects.fade.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.fade.js rename to core/modules/system/assets/ui/ui/jquery.effects.fade.js diff --git a/core/misc/ui/ui/jquery.effects.fold.js b/core/modules/system/assets/ui/ui/jquery.effects.fold.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.fold.js rename to core/modules/system/assets/ui/ui/jquery.effects.fold.js diff --git a/core/misc/ui/ui/jquery.effects.highlight.js b/core/modules/system/assets/ui/ui/jquery.effects.highlight.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.highlight.js rename to core/modules/system/assets/ui/ui/jquery.effects.highlight.js diff --git a/core/misc/ui/ui/jquery.effects.pulsate.js b/core/modules/system/assets/ui/ui/jquery.effects.pulsate.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.pulsate.js rename to core/modules/system/assets/ui/ui/jquery.effects.pulsate.js diff --git a/core/misc/ui/ui/jquery.effects.scale.js b/core/modules/system/assets/ui/ui/jquery.effects.scale.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.scale.js rename to core/modules/system/assets/ui/ui/jquery.effects.scale.js diff --git a/core/misc/ui/ui/jquery.effects.shake.js b/core/modules/system/assets/ui/ui/jquery.effects.shake.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.shake.js rename to core/modules/system/assets/ui/ui/jquery.effects.shake.js diff --git a/core/misc/ui/ui/jquery.effects.slide.js b/core/modules/system/assets/ui/ui/jquery.effects.slide.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.slide.js rename to core/modules/system/assets/ui/ui/jquery.effects.slide.js diff --git a/core/misc/ui/ui/jquery.effects.transfer.js b/core/modules/system/assets/ui/ui/jquery.effects.transfer.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.transfer.js rename to core/modules/system/assets/ui/ui/jquery.effects.transfer.js diff --git a/core/misc/ui/ui/jquery.ui.accordion.js b/core/modules/system/assets/ui/ui/jquery.ui.accordion.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.accordion.js rename to core/modules/system/assets/ui/ui/jquery.ui.accordion.js diff --git a/core/misc/ui/ui/jquery.ui.autocomplete.js b/core/modules/system/assets/ui/ui/jquery.ui.autocomplete.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.autocomplete.js rename to core/modules/system/assets/ui/ui/jquery.ui.autocomplete.js diff --git a/core/misc/ui/ui/jquery.ui.button.js b/core/modules/system/assets/ui/ui/jquery.ui.button.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.button.js rename to core/modules/system/assets/ui/ui/jquery.ui.button.js diff --git a/core/misc/ui/ui/jquery.ui.core.js b/core/modules/system/assets/ui/ui/jquery.ui.core.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.core.js rename to core/modules/system/assets/ui/ui/jquery.ui.core.js diff --git a/core/misc/ui/ui/jquery.ui.datepicker.js b/core/modules/system/assets/ui/ui/jquery.ui.datepicker.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.datepicker.js rename to core/modules/system/assets/ui/ui/jquery.ui.datepicker.js diff --git a/core/misc/ui/ui/jquery.ui.dialog.js b/core/modules/system/assets/ui/ui/jquery.ui.dialog.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.dialog.js rename to core/modules/system/assets/ui/ui/jquery.ui.dialog.js diff --git a/core/misc/ui/ui/jquery.ui.draggable.js b/core/modules/system/assets/ui/ui/jquery.ui.draggable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.draggable.js rename to core/modules/system/assets/ui/ui/jquery.ui.draggable.js diff --git a/core/misc/ui/ui/jquery.ui.droppable.js b/core/modules/system/assets/ui/ui/jquery.ui.droppable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.droppable.js rename to core/modules/system/assets/ui/ui/jquery.ui.droppable.js diff --git a/core/misc/ui/ui/jquery.ui.effect-blind.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-blind.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-blind.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-blind.js diff --git a/core/misc/ui/ui/jquery.ui.effect-bounce.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-bounce.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-bounce.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-bounce.js diff --git a/core/misc/ui/ui/jquery.ui.effect-clip.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-clip.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-clip.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-clip.js diff --git a/core/misc/ui/ui/jquery.ui.effect-drop.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-drop.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-drop.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-drop.js diff --git a/core/misc/ui/ui/jquery.ui.effect-explode.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-explode.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-explode.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-explode.js diff --git a/core/misc/ui/ui/jquery.ui.effect-fade.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-fade.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-fade.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-fade.js diff --git a/core/misc/ui/ui/jquery.ui.effect-fold.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-fold.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-fold.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-fold.js diff --git a/core/misc/ui/ui/jquery.ui.effect-highlight.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-highlight.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-highlight.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-highlight.js diff --git a/core/misc/ui/ui/jquery.ui.effect-pulsate.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-pulsate.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-pulsate.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-pulsate.js diff --git a/core/misc/ui/ui/jquery.ui.effect-scale.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-scale.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-scale.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-scale.js diff --git a/core/misc/ui/ui/jquery.ui.effect-shake.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-shake.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-shake.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-shake.js diff --git a/core/misc/ui/ui/jquery.ui.effect-slide.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-slide.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-slide.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-slide.js diff --git a/core/misc/ui/ui/jquery.ui.effect-transfer.js b/core/modules/system/assets/ui/ui/jquery.ui.effect-transfer.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-transfer.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect-transfer.js diff --git a/core/misc/ui/ui/jquery.ui.effect.js b/core/modules/system/assets/ui/ui/jquery.ui.effect.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect.js rename to core/modules/system/assets/ui/ui/jquery.ui.effect.js diff --git a/core/misc/ui/ui/jquery.ui.menu.js b/core/modules/system/assets/ui/ui/jquery.ui.menu.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.menu.js rename to core/modules/system/assets/ui/ui/jquery.ui.menu.js diff --git a/core/misc/ui/ui/jquery.ui.mouse.js b/core/modules/system/assets/ui/ui/jquery.ui.mouse.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.mouse.js rename to core/modules/system/assets/ui/ui/jquery.ui.mouse.js diff --git a/core/misc/ui/ui/jquery.ui.position.js b/core/modules/system/assets/ui/ui/jquery.ui.position.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.position.js rename to core/modules/system/assets/ui/ui/jquery.ui.position.js diff --git a/core/misc/ui/ui/jquery.ui.progressbar.js b/core/modules/system/assets/ui/ui/jquery.ui.progressbar.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.progressbar.js rename to core/modules/system/assets/ui/ui/jquery.ui.progressbar.js diff --git a/core/misc/ui/ui/jquery.ui.resizable.js b/core/modules/system/assets/ui/ui/jquery.ui.resizable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.resizable.js rename to core/modules/system/assets/ui/ui/jquery.ui.resizable.js diff --git a/core/misc/ui/ui/jquery.ui.selectable.js b/core/modules/system/assets/ui/ui/jquery.ui.selectable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.selectable.js rename to core/modules/system/assets/ui/ui/jquery.ui.selectable.js diff --git a/core/misc/ui/ui/jquery.ui.slider.js b/core/modules/system/assets/ui/ui/jquery.ui.slider.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.slider.js rename to core/modules/system/assets/ui/ui/jquery.ui.slider.js diff --git a/core/misc/ui/ui/jquery.ui.sortable.js b/core/modules/system/assets/ui/ui/jquery.ui.sortable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.sortable.js rename to core/modules/system/assets/ui/ui/jquery.ui.sortable.js diff --git a/core/misc/ui/ui/jquery.ui.spinner.js b/core/modules/system/assets/ui/ui/jquery.ui.spinner.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.spinner.js rename to core/modules/system/assets/ui/ui/jquery.ui.spinner.js diff --git a/core/misc/ui/ui/jquery.ui.tabs.js b/core/modules/system/assets/ui/ui/jquery.ui.tabs.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.tabs.js rename to core/modules/system/assets/ui/ui/jquery.ui.tabs.js diff --git a/core/misc/ui/ui/jquery.ui.tooltip.js b/core/modules/system/assets/ui/ui/jquery.ui.tooltip.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.tooltip.js rename to core/modules/system/assets/ui/ui/jquery.ui.tooltip.js diff --git a/core/misc/ui/ui/jquery.ui.widget.js b/core/modules/system/assets/ui/ui/jquery.ui.widget.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.widget.js rename to core/modules/system/assets/ui/ui/jquery.ui.widget.js diff --git a/core/misc/vertical-tabs-rtl.css b/core/modules/system/assets/vertical-tabs-rtl.css similarity index 100% rename from core/misc/vertical-tabs-rtl.css rename to core/modules/system/assets/vertical-tabs-rtl.css diff --git a/core/misc/vertical-tabs.css b/core/modules/system/assets/vertical-tabs.css similarity index 100% rename from core/misc/vertical-tabs.css rename to core/modules/system/assets/vertical-tabs.css diff --git a/core/misc/vertical-tabs.js b/core/modules/system/assets/vertical-tabs.js similarity index 100% rename from core/misc/vertical-tabs.js rename to core/modules/system/assets/vertical-tabs.js diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php index 9507e3b..2a855be 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php @@ -67,8 +67,8 @@ class JavaScriptTest extends WebTestBase { * Test adding a JavaScript file. */ function testAddFile() { - $javascript = drupal_add_js('core/misc/collapse.js'); - $this->assertTrue(array_key_exists('core/misc/collapse.js', $javascript), 'JavaScript files are correctly added.'); + $javascript = drupal_add_js('core/modules/system/assets/collapse.js'); + $this->assertTrue(array_key_exists('core/modules/system/assets/collapse.js', $javascript), t('JavaScript files are correctly added.')); } /** @@ -104,11 +104,11 @@ class JavaScriptTest extends WebTestBase { drupal_add_library('system', 'drupal'); drupal_add_js('http://example.com/script.js', array('async' => TRUE)); - drupal_add_js('core/misc/collapse.js', array('async' => TRUE)); + drupal_add_js('core/modules/system/assets/collapse.js', array('async' => TRUE)); $javascript = drupal_get_js(); $expected_1 = ''; - $expected_2 = ''; + $expected_2 = ''; $this->assertTrue(strpos($javascript, $expected_1) > 0, 'Rendered external JavaScript with correct async attribute.'); $this->assertTrue(strpos($javascript, $expected_2) > 0, 'Rendered internal JavaScript with correct async attribute.'); @@ -122,11 +122,11 @@ class JavaScriptTest extends WebTestBase { drupal_add_library('system', 'drupal'); drupal_add_js('http://example.com/script.js', array('defer' => TRUE)); - drupal_add_js('core/misc/collapse.js', array('defer' => TRUE)); + drupal_add_js('core/modules/system/assets/collapse.js', array('defer' => TRUE)); $javascript = drupal_get_js(); $expected_1 = ''; - $expected_2 = ''; + $expected_2 = ''; $this->assertTrue(strpos($javascript, $expected_1) > 0, 'Rendered external JavaScript with correct defer attribute.'); $this->assertTrue(strpos($javascript, $expected_2) > 0, 'Rendered internal JavaScript with correct defer attribute.'); @@ -183,7 +183,7 @@ class JavaScriptTest extends WebTestBase { */ function testReset() { drupal_add_library('system', 'drupal'); - drupal_add_js('core/misc/collapse.js'); + drupal_add_js('core/modules/system/assets/collapse.js'); drupal_static_reset('drupal_add_js'); $this->assertEqual(array(), drupal_add_js(), 'Resetting the JavaScript correctly empties the cache.'); } @@ -195,7 +195,7 @@ class JavaScriptTest extends WebTestBase { drupal_add_library('system', 'drupal'); $inline = 'jQuery(function () { });'; $javascript = drupal_add_js($inline, array('type' => 'inline', 'scope' => 'footer')); - $this->assertTrue(array_key_exists('core/misc/jquery.js', $javascript), t('jQuery is added when inline scripts are added.')); + $this->assertTrue(array_key_exists('core/modules/system/assets/jquery.js', $javascript), t('jQuery is added when inline scripts are added.')); $data = end($javascript); $this->assertEqual($inline, $data['data'], 'Inline JavaScript is correctly added to the footer.'); } @@ -228,8 +228,8 @@ class JavaScriptTest extends WebTestBase { */ function testNoCache() { drupal_add_library('system', 'drupal'); - $javascript = drupal_add_js('core/misc/collapse.js', array('cache' => FALSE)); - $this->assertFalse($javascript['core/misc/collapse.js']['preprocess'], 'Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.'); + $javascript = drupal_add_js('core/modules/system/assets/collapse.js', array('cache' => FALSE)); + $this->assertFalse($javascript['core/modules/system/assets/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.')); } /** @@ -237,16 +237,16 @@ class JavaScriptTest extends WebTestBase { */ function testDifferentGroup() { drupal_add_library('system', 'drupal'); - $javascript = drupal_add_js('core/misc/collapse.js', array('group' => JS_THEME)); - $this->assertEqual($javascript['core/misc/collapse.js']['group'], JS_THEME, 'Adding a JavaScript file with a different group caches the given group.'); + $javascript = drupal_add_js('core/modules/system/assets/collapse.js', array('group' => JS_THEME)); + $this->assertEqual($javascript['core/modules/system/assets/collapse.js']['group'], JS_THEME, t('Adding a JavaScript file with a different group caches the given group.')); } /** * Test adding a JavaScript file with a different weight. */ function testDifferentWeight() { - $javascript = drupal_add_js('core/misc/collapse.js', array('weight' => 2)); - $this->assertEqual($javascript['core/misc/collapse.js']['weight'], 2, 'Adding a JavaScript file with a different weight caches the given weight.'); + $javascript = drupal_add_js('core/modules/system/assets/collapse.js', array('weight' => 2)); + $this->assertEqual($javascript['core/modules/system/assets/collapse.js']['weight'], 2, t('Adding a JavaScript file with a different weight caches the given weight.')); } /** @@ -258,11 +258,11 @@ class JavaScriptTest extends WebTestBase { $default_query_string = variable_get('css_js_query_string', '0'); drupal_add_library('system', 'drupal'); - drupal_add_js('core/misc/collapse.js', array('browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE))); + drupal_add_js('core/modules/system/assets/collapse.js', array('browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE))); drupal_add_js('jQuery(function () { });', array('type' => 'inline', 'browsers' => array('IE' => FALSE))); $javascript = drupal_get_js(); - $expected_1 = ""; + $expected_1 = ""; $expected_2 = "\n" . '' . "\n"; $this->assertTrue(strpos($javascript, $expected_1) > 0, 'Rendered JavaScript within downlevel-hidden conditional comments.'); @@ -274,10 +274,10 @@ class JavaScriptTest extends WebTestBase { */ function testVersionQueryString() { drupal_add_library('system', 'drupal'); - drupal_add_js('core/misc/collapse.js', array('version' => 'foo')); - drupal_add_js('core/misc/ajax.js', array('version' => 'bar')); + drupal_add_js('core/modules/system/assets/collapse.js', array('version' => 'foo')); + drupal_add_js('core/modules/system/assets/ajax.js', array('version' => 'bar')); $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'core/misc/collapse.js?v=foo') > 0 && strpos($javascript, 'core/misc/ajax.js?v=bar') > 0 , 'JavaScript version identifiers correctly appended to URLs'); + $this->assertTrue(strpos($javascript, 'core/modules/system/assets/collapse.js?v=foo') > 0 && strpos($javascript, 'core/misc/ajax.js?v=bar') > 0 , 'JavaScript version identifiers correctly appended to URLs'); } /** @@ -291,16 +291,16 @@ class JavaScriptTest extends WebTestBase { // same regardless of whether aggregation is enabled, so ensure this // expected order, first with aggregation off. drupal_add_library('system', 'drupal'); - drupal_add_js('core/misc/ajax.js'); - drupal_add_js('core/misc/collapse.js', array('every_page' => TRUE)); - drupal_add_js('core/misc/autocomplete.js'); - drupal_add_js('core/misc/batch.js', array('every_page' => TRUE)); + drupal_add_js('core/modules/system/assets/ajax.js'); + drupal_add_js('core/modules/system/assets/collapse.js', array('every_page' => TRUE)); + drupal_add_js('core/modules/system/assets/autocomplete.js'); + drupal_add_js('core/modules/system/assets/batch.js', array('every_page' => TRUE)); $javascript = drupal_get_js(); $expected = implode("\n", array( - '', - '', - '', - '', + '', + '', + '', + '', )); $this->assertTrue(strpos($javascript, $expected) > 0, 'Unaggregated JavaScript is added in the expected group order.'); @@ -311,15 +311,15 @@ class JavaScriptTest extends WebTestBase { $config->set('preprocess.js', 1); $config->save(); drupal_add_library('system', 'drupal'); - drupal_add_js('core/misc/ajax.js'); - drupal_add_js('core/misc/collapse.js', array('every_page' => TRUE)); - drupal_add_js('core/misc/autocomplete.js'); - drupal_add_js('core/misc/batch.js', array('every_page' => TRUE)); + drupal_add_js('core/modules/system/assets/ajax.js'); + drupal_add_js('core/modules/system/assets/collapse.js', array('every_page' => TRUE)); + drupal_add_js('core/modules/system/assets/autocomplete.js'); + drupal_add_js('core/modules/system/assets/batch.js', array('every_page' => TRUE)); $js_items = drupal_add_js(); $javascript = drupal_get_js(); $expected = implode("\n", array( - '', - '', + '', + '', )); $this->assertTrue(strpos($javascript, $expected) !== FALSE, 'JavaScript is aggregated in the expected groups and order.'); } @@ -334,13 +334,13 @@ class JavaScriptTest extends WebTestBase { // Add two JavaScript files to the current request and build the cache. drupal_add_library('system', 'drupal'); - drupal_add_js('core/misc/ajax.js'); - drupal_add_js('core/misc/autocomplete.js'); + drupal_add_js('core/modules/system/assets/ajax.js'); + drupal_add_js('core/modules/system/assets/autocomplete.js'); $js_items = drupal_add_js(); drupal_build_js_cache(array( - 'core/misc/ajax.js' => $js_items['core/misc/ajax.js'], - 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js'] + 'core/modules/system/assets/ajax.js' => $js_items['core/modules/system/assets/ajax.js'], + 'core/modules/system/assets/autocomplete.js' => $js_items['core/modules/system/assets/autocomplete.js'] )); // Store the expected key for the first item in the cache. @@ -352,14 +352,14 @@ class JavaScriptTest extends WebTestBase { drupal_static_reset('drupal_add_js'); drupal_add_library('system', 'drupal'); drupal_add_js('some/custom/javascript_file.js', array('scope' => 'footer')); - drupal_add_js('core/misc/ajax.js'); - drupal_add_js('core/misc/autocomplete.js'); + drupal_add_js('core/modules/system/assets/ajax.js'); + drupal_add_js('core/modules/system/assets/autocomplete.js'); // Rebuild the cache. $js_items = drupal_add_js(); drupal_build_js_cache(array( - 'core/misc/ajax.js' => $js_items['core/misc/ajax.js'], - 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js'] + 'core/modules/system/assets/ajax.js' => $js_items['core/modules/system/assets/ajax.js'], + 'core/modules/system/assets/autocomplete.js' => $js_items['core/modules/system/assets/autocomplete.js'] )); // Compare the expected key for the first file to the current one. @@ -418,9 +418,9 @@ class JavaScriptTest extends WebTestBase { // flag, then by weight (see drupal_sort_css_js()), so to test the effect of // weight, we need the other two options to be the same. drupal_add_library('system', 'jquery'); - drupal_add_js('core/misc/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21)); + drupal_add_js('core/modules/system/assets/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21)); $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'core/misc/collapse.js') < strpos($javascript, 'core/misc/jquery.js'), 'Rendering a JavaScript file above jQuery.'); + $this->assertTrue(strpos($javascript, 'core/modules/system/assets/collapse.js') < strpos($javascript, 'core/modules/system/assets/jquery.js'), 'Rendering a JavaScript file above jQuery.'); } /** @@ -430,14 +430,14 @@ class JavaScriptTest extends WebTestBase { */ function testAlter() { // Add both tableselect.js and simpletest.js, with a larger weight on SimpleTest. - drupal_add_js('core/misc/tableselect.js'); + drupal_add_js('core/modules/system/assets/tableselect.js'); drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js', array('weight' => 9999)); // Render the JavaScript, testing if simpletest.js was altered to be before // tableselect.js. See simpletest_js_alter() to see where this alteration // takes place. $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/misc/tableselect.js'), 'Altering JavaScript weight through the alter hook.'); + $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/modules/system/assets/tableselect.js'), 'Altering JavaScript weight through the alter hook.'); } /** @@ -448,8 +448,8 @@ class JavaScriptTest extends WebTestBase { $this->assertTrue($result !== FALSE, t('Library was added without errors.')); $scripts = drupal_get_js(); $styles = drupal_get_css(); - $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), 'JavaScript of library was added to the page.'); - $this->assertTrue(strpos($styles, 'core/misc/farbtastic/farbtastic.css'), 'Stylesheet of library was added to the page.'); + $this->assertTrue(strpos($scripts, 'core/modules/system/assets/farbtastic/farbtastic.js'), 'JavaScript of library was added to the page.'); + $this->assertTrue(strpos($styles, 'core/modules/system/assets/farbtastic/farbtastic.css'), 'Stylesheet of library was added to the page.'); } /** @@ -465,7 +465,7 @@ class JavaScriptTest extends WebTestBase { // common_test_library_info_alter() also added a dependency on jQuery Form. drupal_add_library('system', 'jquery.farbtastic'); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'core/misc/jquery.form.js'), 'Altered library dependencies are added to the page.'); + $this->assertTrue(strpos($scripts, 'core/modules/system/assets/jquery.form.js'), t('Altered library dependencies are added to the page.')); } /** @@ -499,7 +499,7 @@ class JavaScriptTest extends WebTestBase { $element['#attached']['library'][] = array('system', 'jquery.farbtastic'); drupal_render($element); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), 'The attached_library property adds the additional libraries.'); + $this->assertTrue(strpos($scripts, 'core/modules/system/assets/farbtastic/farbtastic.js'), t('The attached_library property adds the additional libraries.')); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php index bce5684..0835409 100644 --- a/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php @@ -36,7 +36,7 @@ class UrlRewritingTest extends FileTestBase { // Test alteration of file URLs to use a CDN. variable_set('file_test_hook_file_url_alter', 'cdn'); - $filepath = 'core/misc/jquery.js'; + $filepath = 'core/modules/system/assets/jquery.js'; $url = file_create_url($filepath); $this->assertEqual(FILE_URL_TEST_CDN_1 . '/' . $filepath, $url, 'Correctly generated a CDN URL for a shipped file.'); $filepath = 'core/misc/favicon.ico'; @@ -45,7 +45,7 @@ class UrlRewritingTest extends FileTestBase { // Test alteration of file URLs to use root-relative URLs. variable_set('file_test_hook_file_url_alter', 'root-relative'); - $filepath = 'core/misc/jquery.js'; + $filepath = 'core/modules/system/assets/jquery.js'; $url = file_create_url($filepath); $this->assertEqual(base_path() . '/' . $filepath, $url, 'Correctly generated a root-relative URL for a shipped file.'); $filepath = 'core/misc/favicon.ico'; @@ -54,7 +54,7 @@ class UrlRewritingTest extends FileTestBase { // Test alteration of file URLs to use protocol-relative URLs. variable_set('file_test_hook_file_url_alter', 'protocol-relative'); - $filepath = 'core/misc/jquery.js'; + $filepath = 'core/modules/system/assets/jquery.js'; $url = file_create_url($filepath); $this->assertEqual('/' . base_path() . '/' . $filepath, $url, 'Correctly generated a protocol-relative URL for a shipped file.'); $filepath = 'core/misc/favicon.ico'; diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php index 9c16ec3..ab9b1d4 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php @@ -36,8 +36,8 @@ class ElementsVerticalTabsTest extends WebTestBase { */ function testJavaScriptOrdering() { $this->drupalGet('form_test/vertical-tabs'); - $position1 = strpos($this->content, 'core/misc/vertical-tabs.js'); - $position2 = strpos($this->content, 'core/misc/collapse.js'); + $position1 = strpos($this->content, 'core/modules/system/assets/vertical-tabs.js'); + $position2 = strpos($this->content, 'core/modules/system/assets/collapse.js'); $this->assertTrue($position1 !== FALSE && $position2 !== FALSE && $position1 < $position2, t('vertical-tabs.js is included before collapse.js')); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php index ef51f4e..5ca8a84 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php @@ -29,7 +29,7 @@ class TableTest extends WebTestBase { $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); $this->content = theme('table', array('header' => $header, 'rows' => $rows)); $js = drupal_add_js(); - $this->assertTrue(isset($js['core/misc/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.')); + $this->assertTrue(isset($js['core/modules/system/assets/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.')); $this->assertRaw('sticky-enabled', t('Table has a class of sticky-enabled when $sticky = TRUE.')); drupal_static_reset('drupal_add_js'); } @@ -45,7 +45,7 @@ class TableTest extends WebTestBase { $colgroups = array(); $this->content = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes, 'caption' => $caption, 'colgroups' => $colgroups, 'sticky' => FALSE)); $js = drupal_add_js(); - $this->assertFalse(isset($js['core/misc/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.')); + $this->assertFalse(isset($js['core/modules/system/assets/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.')); $this->assertNoRaw('sticky-enabled', t('Table does not have a class of sticky-enabled because $sticky = FALSE.')); drupal_static_reset('drupal_add_js'); } diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 66aa5e8..1137a39 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -365,7 +365,7 @@ function hook_exit($destination = NULL) { */ function hook_js_alter(&$javascript) { // Swap out jQuery to use an updated version of the library. - $javascript['core/misc/jquery.js']['data'] = drupal_get_path('module', 'jquery_update') . '/jquery.js'; + $javascript['core/modules/system/assets/jquery.js']['data'] = drupal_get_path('module', 'jquery_update') . '/jquery.js'; } /** diff --git a/core/modules/system/system.module b/core/modules/system/system.module index bfa91db..ffa1703 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1130,7 +1130,7 @@ function system_library_info() { 'title' => 'Drupal', 'version' => VERSION, 'js' => array( - 'core/misc/drupal.js' => array('group' => JS_LIBRARY, 'weight' => -18), + 'core/modules/system/assets/drupal.js' => array('group' => JS_LIBRARY, 'weight' => -18), ), 'dependencies' => array( array('system', 'jquery'), @@ -1152,7 +1152,7 @@ function system_library_info() { 'website' => 'http://api.drupal.org/api/group/ajax/8', 'version' => VERSION, 'js' => array( - 'core/misc/ajax.js' => array('group' => JS_LIBRARY, 'weight' => 2), + 'core/modules/system/assets/ajax.js' => array('group' => JS_LIBRARY, 'weight' => 2), ), 'dependencies' => array( array('system', 'jquery'), @@ -1167,7 +1167,7 @@ function system_library_info() { 'title' => 'Drupal batch API', 'version' => VERSION, 'js' => array( - 'core/misc/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), + 'core/modules/system/assets/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), ), 'dependencies' => array( array('system', 'jquery'), @@ -1183,7 +1183,7 @@ function system_library_info() { 'title' => 'Drupal progress indicator', 'version' => VERSION, 'js' => array( - 'core/misc/progress.js' => array('group' => JS_DEFAULT), + 'core/modules/system/assets/progress.js' => array('group' => JS_DEFAULT), ), 'dependencies' => array( array('system', 'drupal'), @@ -1197,7 +1197,7 @@ function system_library_info() { 'title' => 'Drupal form library', 'version' => VERSION, 'js' => array( - 'core/misc/form.js' => array('group' => JS_LIBRARY, 'weight' => 1), + 'core/modules/system/assets/form.js' => array('group' => JS_LIBRARY, 'weight' => 1), ), 'dependencies' => array( array('system', 'jquery'), @@ -1212,7 +1212,7 @@ function system_library_info() { 'title' => 'Drupal states', 'version' => VERSION, 'js' => array( - 'core/misc/states.js' => array('group' => JS_LIBRARY, 'weight' => 1), + 'core/modules/system/assets/states.js' => array('group' => JS_LIBRARY, 'weight' => 1), ), 'dependencies' => array( array('system', 'jquery'), @@ -1227,7 +1227,7 @@ function system_library_info() { 'title' => 'Drupal tabledrag', 'version' => VERSION, 'js' => array( - 'core/misc/tabledrag.js' => array('group' => JS_LIBRARY, 'weight' => -1), + 'core/modules/system/assets/tabledrag.js' => array('group' => JS_LIBRARY, 'weight' => -1), ), 'dependencies' => array( array('system', 'jquery'), @@ -1243,7 +1243,7 @@ function system_library_info() { 'title' => 'Drupal responsive table API', 'version' => VERSION, 'js' => array( - 'core/misc/tableresponsive.js' => array('group' => JS_LIBRARY), + 'core/modules/system/assets/tableresponsive.js' => array('group' => JS_LIBRARY), ), 'dependencies' => array( array('system', 'jquery'), @@ -1257,7 +1257,7 @@ function system_library_info() { 'title' => 'Drupal collapsible fieldset', 'version' => VERSION, 'js' => array( - 'core/misc/collapse.js' => array('group' => JS_DEFAULT), + 'core/modules/system/assets/collapse.js' => array('group' => JS_DEFAULT), ), 'dependencies' => array( array('system', 'jquery'), @@ -1272,7 +1272,7 @@ function system_library_info() { 'title' => 'Drupal autocomplete', 'version' => VERSION, 'js' => array( - 'core/misc/autocomplete.js' => array('group' => JS_DEFAULT), + 'core/modules/system/assets/autocomplete.js' => array('group' => JS_DEFAULT), ), 'dependencies' => array( array('system', 'jquery'), @@ -1287,7 +1287,7 @@ function system_library_info() { 'website' => 'http://jquery.com', 'version' => '1.7.0', 'js' => array( - 'core/misc/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20), + 'core/modules/system/assets/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20), ), ); @@ -1297,7 +1297,7 @@ function system_library_info() { 'website' => 'http://plugins.jquery.com/project/once', 'version' => '1.2', 'js' => array( - 'core/misc/jquery.once.js' => array('group' => JS_LIBRARY, 'weight' => -19), + 'core/modules/system/assets/jquery.once.js' => array('group' => JS_LIBRARY, 'weight' => -19), ), 'dependencies' => array( array('system', 'jquery'), @@ -1310,7 +1310,7 @@ function system_library_info() { 'website' => 'http://malsup.com/jquery/form/', 'version' => '2.87', 'js' => array( - 'core/misc/jquery.form.js' => array(), + 'core/modules/system/assets/jquery.form.js' => array(), ), 'dependencies' => array( array('system', 'jquery'), @@ -1324,7 +1324,7 @@ function system_library_info() { 'website' => 'http://benalman.com/projects/jquery-bbq-plugin/', 'version' => '1.2.1', 'js' => array( - 'core/misc/jquery.ba-bbq.js' => array(), + 'core/modules/system/assets/jquery.ba-bbq.js' => array(), ), 'dependencies' => array( array('system', 'jquery'), @@ -1337,10 +1337,10 @@ function system_library_info() { 'website' => 'http://drupal.org/node/323112', 'version' => '1.0', 'js' => array( - 'core/misc/vertical-tabs.js' => array(), + 'core/modules/system/assets/vertical-tabs.js' => array(), ), 'css' => array( - 'core/misc/vertical-tabs.css' => array(), + 'core/modules/system/assets/vertical-tabs.css' => array(), ), 'dependencies' => array( array('system', 'jquery'), @@ -1357,10 +1357,10 @@ function system_library_info() { 'website' => 'http://code.google.com/p/farbtastic/', 'version' => '1.2', 'js' => array( - 'core/misc/farbtastic/farbtastic.js' => array(), + 'core/modules/system/assets/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'core/misc/farbtastic/farbtastic.css' => array(), + 'core/modules/system/assets/farbtastic/farbtastic.css' => array(), ), ); @@ -1370,7 +1370,7 @@ function system_library_info() { 'website' => 'http://code.google.com/p/html5shiv/', 'version' => '11', 'js' => array( - 'core/misc/html5.js' => array( + 'core/modules/system/assets/html5.js' => array( 'group' => JS_LIBRARY, 'weight' => -21, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), @@ -1384,11 +1384,11 @@ function system_library_info() { 'website' => 'http://jqueryui.com', 'version' => '1.9.0-pre', 'js' => array( - 'core/misc/ui/ui/jquery.ui.core.js' => array('group' => JS_LIBRARY, 'weight' => -11), + 'core/modules/system/assets/ui/ui/jquery.ui.core.js' => array('group' => JS_LIBRARY, 'weight' => -11), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.core.css' => array(), - 'core/misc/ui/themes/base/jquery.ui.theme.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.core.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.theme.css' => array(), ), 'dependencies' => array( array('system', 'jquery'), @@ -1399,10 +1399,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/accordion/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.accordion.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.accordion.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.accordion.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.accordion.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1414,10 +1414,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/autocomplete/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.autocomplete.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.autocomplete.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.autocomplete.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.autocomplete.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1431,10 +1431,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/button/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.button.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.button.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.button.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.button.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1446,10 +1446,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/datepicker/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.datepicker.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.datepicker.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.datepicker.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.datepicker.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1460,10 +1460,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/dialog/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.dialog.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.dialog.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.dialog.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.dialog.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1480,7 +1480,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/draggable/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.draggable.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.draggable.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1493,7 +1493,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/droppable/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.droppable.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.droppable.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1507,10 +1507,10 @@ function system_library_info() { 'website' => 'http://docs.jquery.com/UI/Menu', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.menu.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.menu.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.menu.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.menu.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1522,7 +1522,7 @@ function system_library_info() { 'website' => 'http://docs.jquery.com/UI/Mouse', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.mouse.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.mouse.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.widget'), @@ -1533,7 +1533,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/position/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.position.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.position.js' => array(), ), ); $libraries['jquery.ui.progressbar'] = array( @@ -1541,10 +1541,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/progressbar/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.progressbar.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.progressbar.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.progressbar.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.progressbar.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1556,10 +1556,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/resizable/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.resizable.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.resizable.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.resizable.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.resizable.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1572,10 +1572,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/selectable/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.selectable.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.selectable.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.selectable.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.selectable.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1588,10 +1588,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/slider/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.slider.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.slider.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.slider.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.slider.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1604,7 +1604,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/sortable/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.sortable.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.sortable.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1617,7 +1617,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/spinner/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.spinner.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.spinner.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1630,10 +1630,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/tabs/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.tabs.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.tabs.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.tabs.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.tabs.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1645,10 +1645,10 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/tooltip/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.tooltip.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.ui.tooltip.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.tooltip.css' => array(), + 'core/modules/system/assets/ui/themes/base/jquery.ui.tooltip.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1661,7 +1661,7 @@ function system_library_info() { 'website' => 'http://docs.jquery.com/UI/Widget', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.ui.widget.js' => array('group' => JS_LIBRARY, 'weight' => -10), + 'core/modules/system/assets/ui/ui/jquery.ui.widget.js' => array('group' => JS_LIBRARY, 'weight' => -10), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1672,7 +1672,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.core.js' => array('group' => JS_LIBRARY, 'weight' => -9), + 'core/modules/system/assets/ui/ui/jquery.effects.core.js' => array('group' => JS_LIBRARY, 'weight' => -9), ), ); $libraries['jquery.effects.blind'] = array( @@ -1680,7 +1680,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.blind.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.blind.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1691,7 +1691,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.bounce.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.bounce.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1702,7 +1702,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.clip.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.clip.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1713,7 +1713,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.drop.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.drop.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1724,7 +1724,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.explode.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.explode.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1735,7 +1735,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.fade.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.fade.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1746,7 +1746,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.fold.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.fold.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1757,7 +1757,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.highlight.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.highlight.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1768,7 +1768,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.pulsate.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.pulsate.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1779,7 +1779,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.scale.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.scale.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1790,7 +1790,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.shake.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.shake.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1801,7 +1801,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.slide.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.slide.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1812,7 +1812,7 @@ function system_library_info() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => $libraries['jquery.ui.core']['version'], 'js' => array( - 'core/misc/ui/ui/jquery.effects.transfer.js' => array(), + 'core/modules/system/assets/ui/ui/jquery.effects.transfer.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1825,7 +1825,7 @@ function system_library_info() { 'website' => 'http://plugins.jquery.com/project/cookie', 'version' => $libraries['jquery.ui.core']['version'], // Shipped with jQuery UI. 'js' => array( - 'core/misc/ui/external/jquery.cookie.js' => array(), + 'core/modules/system/assets/ui/external/jquery.cookie.js' => array(), ), 'dependencies' => array( array('system', 'jquery'), @@ -1836,7 +1836,7 @@ function system_library_info() { 'title' => 'Tableselect', 'version' => VERSION, 'js' => array( - 'core/misc/tableselect.js' => array(), + 'core/modules/system/assets/tableselect.js' => array(), ), 'dependencies' => array( array('system', 'drupal'), @@ -1847,7 +1847,7 @@ function system_library_info() { 'title' => 'Table header', 'version' => VERSION, 'js' => array( - 'core/misc/tableheader.js' => array(), + 'core/modules/system/assets/tableheader.js' => array(), ), 'dependencies' => array( array('system', 'jquery'), @@ -1860,7 +1860,7 @@ function system_library_info() { 'title' => 'Timezone', 'version' => VERSION, 'js' => array( - 'core/misc/timezone.js' => array(), + 'core/modules/system/assets/timezone.js' => array(), ), 'dependencies' => array( array('system', 'jquery'), @@ -1871,7 +1871,7 @@ function system_library_info() { 'title' => 'Machine name', 'version' => VERSION, 'js' => array( - 'core/misc/machine-name.js' => array(), + 'core/modules/system/assets/machine-name.js' => array(), ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module index 37243cf..6032157 100644 --- a/core/modules/system/tests/modules/common_test/common_test.module +++ b/core/modules/system/tests/modules/common_test/common_test.module @@ -256,10 +256,10 @@ function common_test_library_info() { 'website' => 'http://code.google.com/p/farbtastic/', 'version' => '5.3', 'js' => array( - 'core/misc/farbtastic/farbtastic.js' => array(), + 'core/modules/system/assets/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'core/misc/farbtastic/farbtastic.css' => array(), + 'core/modules/system/assets/farbtastic/farbtastic.css' => array(), ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php index a8643ab..79a5ccf 100644 --- a/core/themes/seven/template.php +++ b/core/themes/seven/template.php @@ -104,14 +104,14 @@ function seven_tablesort_indicator($variables) { */ function seven_css_alter(&$css) { // Use Seven's vertical tabs style instead of the default one. - if (isset($css['core/misc/vertical-tabs.css'])) { - $css['core/misc/vertical-tabs.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs.css'; + if (isset($css['core/modules/system/assets/vertical-tabs.css'])) { + $css['core/modules/system/assets/vertical-tabs.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs.css'; } - if (isset($css['core/misc/vertical-tabs-rtl.css'])) { - $css['core/misc/vertical-tabs-rtl.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs-rtl.css'; + if (isset($css['core/modules/system/assets/vertical-tabs-rtl.css'])) { + $css['core/modules/system/assets/vertical-tabs-rtl.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs-rtl.css'; } // Use Seven's jQuery UI theme style instead of the default one. - if (isset($css['core/misc/ui/themes/base/jquery.ui.theme.css'])) { - $css['core/misc/ui/themes/base/jquery.ui.theme.css']['data'] = drupal_get_path('theme', 'seven') . '/jquery.ui.theme.css'; + if (isset($css['core/modules/system/assets/ui/themes/base/jquery.ui.theme.css'])) { + $css['core/modules/system/assets/ui/themes/base/jquery.ui.theme.css']['data'] = drupal_get_path('theme', 'seven') . '/jquery.ui.theme.css'; } }