diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc index ede35da..6c66335 100644 --- a/core/includes/ajax.inc +++ b/core/includes/ajax.inc @@ -746,7 +746,7 @@ function ajax_pre_render_element($element) { * dialog box. * * This command is implemented by Drupal.ajax.prototype.commands.alert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $text * The message string to display to the user. @@ -769,7 +769,7 @@ function ajax_command_alert($text) { * variable of the element that triggered the request. * * This command is implemented by Drupal.ajax.prototype.commands.insert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -800,7 +800,7 @@ function ajax_command_insert($selector, $html, $settings = NULL) { * selector with the given HTML. * * This command is implemented by Drupal.ajax.prototype.commands.insert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -833,7 +833,7 @@ function ajax_command_replace($selector, $html, $settings = NULL) { * selector while leaving the outer tags intact. * * This command is implemented by Drupal.ajax.prototype.commands.insert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -866,7 +866,7 @@ function ajax_command_html($selector, $html, $settings = NULL) { * by the given selector. * * This command is implemented by Drupal.ajax.prototype.commands.insert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -899,7 +899,7 @@ function ajax_command_prepend($selector, $html, $settings = NULL) { * by the given selector. * * This command is implemented by Drupal.ajax.prototype.commands.insert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -932,7 +932,7 @@ function ajax_command_append($selector, $html, $settings = NULL) { * the given selector. * * This command is implemented by Drupal.ajax.prototype.commands.insert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -965,7 +965,7 @@ function ajax_command_after($selector, $html, $settings = NULL) { * the given selector. * * This command is implemented by Drupal.ajax.prototype.commands.insert() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -998,7 +998,7 @@ function ajax_command_before($selector, $html, $settings = NULL) { * within them. * * This command is implemented by Drupal.ajax.prototype.commands.remove() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -1023,7 +1023,7 @@ function ajax_command_remove($selector) { * given selector as 'ajax-changed'. * * This command is implemented by Drupal.ajax.prototype.commands.changed() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -1050,7 +1050,7 @@ function ajax_command_changed($selector, $asterisk = '') { * to apply the CSS arguments to elements matched by the given selector. * * This command is implemented by Drupal.ajax.prototype.commands.css() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -1079,7 +1079,7 @@ function ajax_command_css($selector, $argument) { * given array, depending on the value of the $merge parameter. * * This command is implemented by Drupal.ajax.prototype.commands.settings() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $argument * An array of key/value pairs to add to the settings. This will be utilized @@ -1109,7 +1109,7 @@ function ajax_command_settings($argument, $merge = FALSE) { * data to the selector via jQuery's data cache. * * This command is implemented by Drupal.ajax.prototype.commands.data() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -1143,7 +1143,7 @@ function ajax_command_data($selector, $name, $value) { * removeClass(), toggleClass(), etc. * * This command is implemented by Drupal.ajax.prototype.commands.invoke() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. If the command is a response to a request from @@ -1172,7 +1172,7 @@ function ajax_command_invoke($selector, $method, array $arguments = array()) { * usually used after a table has been modified by a replace or append command. * * This command is implemented by Drupal.ajax.prototype.commands.restripe() - * defined in misc/ajax.js. + * defined in js/src/lib/ajax.js. * * @param $selector * A jQuery selector string. diff --git a/core/includes/common.inc b/core/includes/common.inc index 23069cb..c99be07 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -3844,8 +3844,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/js/src/lib/collapse.js'); + * drupal_add_js('core/js/src/lib/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) @@ -4016,8 +4016,8 @@ function drupal_add_js($data = NULL, $options = NULL) { 'weight' => 0, 'browsers' => array(), ), - 'core/misc/drupal.js' => array( - 'data' => 'core/misc/drupal.js', + 'core/js/src/drupal.js' => array( + 'data' => 'core/js/src/drupal.js', 'type' => 'file', 'scope' => 'header', 'group' => JS_LIBRARY, diff --git a/core/includes/form.inc b/core/includes/form.inc index 571a439..d985956 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -3398,7 +3398,7 @@ function theme_tableselect($variables) { // checkboxes/radios in the first table column. if ($element['#js_select']) { // Add a "Select all" checkbox. - drupal_add_js('core/misc/tableselect.js'); + drupal_add_js('core/js/src/lib/tableselect.js'); array_unshift($header, array('class' => array('select-all'))); } else { @@ -3587,7 +3587,7 @@ function form_process_machine_name($element, &$form_state) { ), ), ); - $element['#attached']['js'][] = 'core/misc/machine-name.js'; + $element['#attached']['js'][] = 'core/js/src/lib/machine-name.js'; $element['#attached']['js'][] = $js_settings; return $element; diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index eb9dff9..423be88 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1572,7 +1572,7 @@ function install_configure_form($form, &$form_state, &$install_state) { drupal_add_js(drupal_get_path('module', 'system') . '/system.js'); // Add JavaScript time zone detection. - drupal_add_js('core/misc/timezone.js'); + drupal_add_js('core/js/src/timezone.js'); // We add these strings as settings because JavaScript translation does not // work on install time. drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting'); diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 22ace17..fe3a77f 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1832,7 +1832,7 @@ function theme_table($variables) { // Add sticky headers, if applicable. if (count($header) && $sticky) { - drupal_add_js('core/misc/tableheader.js'); + drupal_add_js('core/js/src/lib/tableheader.js'); // Add 'sticky-enabled' class to the table to identify it for JS. // This is needed to target tables constructed by this function. $attributes['class'][] = 'sticky-enabled'; diff --git a/core/misc/drupal.js b/core/js/src/drupal.js similarity index 100% rename from core/misc/drupal.js rename to core/js/src/drupal.js diff --git a/core/misc/ajax.js b/core/js/src/lib/ajax.js similarity index 100% rename from core/misc/ajax.js rename to core/js/src/lib/ajax.js diff --git a/core/misc/autocomplete.js b/core/js/src/lib/autocomplete.js similarity index 100% rename from core/misc/autocomplete.js rename to core/js/src/lib/autocomplete.js diff --git a/core/misc/batch.js b/core/js/src/lib/batch.js similarity index 100% rename from core/misc/batch.js rename to core/js/src/lib/batch.js diff --git a/core/misc/collapse.js b/core/js/src/lib/collapse.js similarity index 100% rename from core/misc/collapse.js rename to core/js/src/lib/collapse.js diff --git a/core/misc/form.js b/core/js/src/lib/form.js similarity index 100% rename from core/misc/form.js rename to core/js/src/lib/form.js diff --git a/core/misc/jquery.once.js b/core/js/src/lib/jquery.once.js similarity index 100% rename from core/misc/jquery.once.js rename to core/js/src/lib/jquery.once.js diff --git a/core/misc/machine-name.js b/core/js/src/lib/machine-name.js similarity index 100% rename from core/misc/machine-name.js rename to core/js/src/lib/machine-name.js diff --git a/core/misc/progress.js b/core/js/src/lib/progress.js similarity index 100% rename from core/misc/progress.js rename to core/js/src/lib/progress.js diff --git a/core/misc/states.js b/core/js/src/lib/states.js similarity index 100% rename from core/misc/states.js rename to core/js/src/lib/states.js diff --git a/core/misc/tabledrag.js b/core/js/src/lib/tabledrag.js similarity index 100% rename from core/misc/tabledrag.js rename to core/js/src/lib/tabledrag.js diff --git a/core/misc/tableheader.js b/core/js/src/lib/tableheader.js similarity index 100% rename from core/misc/tableheader.js rename to core/js/src/lib/tableheader.js diff --git a/core/misc/tableselect.js b/core/js/src/lib/tableselect.js similarity index 100% rename from core/misc/tableselect.js rename to core/js/src/lib/tableselect.js diff --git a/core/misc/vertical-tabs-rtl.css b/core/js/src/lib/vertical-tabs-rtl.css similarity index 100% rename from core/misc/vertical-tabs-rtl.css rename to core/js/src/lib/vertical-tabs-rtl.css diff --git a/core/misc/vertical-tabs.css b/core/js/src/lib/vertical-tabs.css similarity index 100% rename from core/misc/vertical-tabs.css rename to core/js/src/lib/vertical-tabs.css diff --git a/core/misc/vertical-tabs.js b/core/js/src/lib/vertical-tabs.js similarity index 100% rename from core/misc/vertical-tabs.js rename to core/js/src/lib/vertical-tabs.js diff --git a/core/misc/timezone.js b/core/js/src/timezone.js similarity index 100% rename from core/misc/timezone.js rename to core/js/src/timezone.js diff --git a/core/misc/html5.js b/core/js/vendor/aFarkas/html5shiv/html5.js similarity index 100% rename from core/misc/html5.js rename to core/js/vendor/aFarkas/html5shiv/html5.js diff --git a/core/misc/jquery.ba-bbq.js b/core/js/vendor/cowboy/jquery-bbq/jquery.ba-bbq.js similarity index 100% rename from core/misc/jquery.ba-bbq.js rename to core/js/vendor/cowboy/jquery-bbq/jquery.ba-bbq.js diff --git a/core/misc/ui/AUTHORS.txt b/core/js/vendor/jquery/jquery-ui/AUTHORS.txt similarity index 100% rename from core/misc/ui/AUTHORS.txt rename to core/js/vendor/jquery/jquery-ui/AUTHORS.txt diff --git a/core/misc/ui/README.md b/core/js/vendor/jquery/jquery-ui/README.md similarity index 100% rename from core/misc/ui/README.md rename to core/js/vendor/jquery/jquery-ui/README.md diff --git a/core/misc/ui/external/globalize.culture.de-DE.js b/core/js/vendor/jquery/jquery-ui/external/globalize.culture.de-DE.js similarity index 100% rename from core/misc/ui/external/globalize.culture.de-DE.js rename to core/js/vendor/jquery/jquery-ui/external/globalize.culture.de-DE.js diff --git a/core/misc/ui/external/globalize.culture.ja-JP.js b/core/js/vendor/jquery/jquery-ui/external/globalize.culture.ja-JP.js similarity index 100% rename from core/misc/ui/external/globalize.culture.ja-JP.js rename to core/js/vendor/jquery/jquery-ui/external/globalize.culture.ja-JP.js diff --git a/core/misc/ui/external/globalize.js b/core/js/vendor/jquery/jquery-ui/external/globalize.js similarity index 100% rename from core/misc/ui/external/globalize.js rename to core/js/vendor/jquery/jquery-ui/external/globalize.js diff --git a/core/misc/ui/external/jquery.bgiframe-2.1.2.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/external/jquery.bgiframe-2.1.2.js diff --git a/core/misc/ui/external/jquery.cookie.js b/core/js/vendor/jquery/jquery-ui/external/jquery.cookie.js similarity index 100% rename from core/misc/ui/external/jquery.cookie.js rename to core/js/vendor/jquery/jquery-ui/external/jquery.cookie.js diff --git a/core/misc/ui/external/jquery.metadata.js b/core/js/vendor/jquery/jquery-ui/external/jquery.metadata.js similarity index 100% rename from core/misc/ui/external/jquery.metadata.js rename to core/js/vendor/jquery/jquery-ui/external/jquery.metadata.js diff --git a/core/misc/ui/external/jquery.mousewheel-3.0.4.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/external/jquery.mousewheel-3.0.4.js diff --git a/core/misc/ui/package.json b/core/js/vendor/jquery/jquery-ui/package.json similarity index 100% rename from core/misc/ui/package.json rename to core/js/vendor/jquery/jquery-ui/package.json diff --git a/core/misc/ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/themes/base/images/ui-icons_cd0a0a_256x240.png diff --git a/core/misc/ui/themes/base/jquery.ui.accordion.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.accordion.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.accordion.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.accordion.css diff --git a/core/misc/ui/themes/base/jquery.ui.all.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.all.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.all.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.all.css diff --git a/core/misc/ui/themes/base/jquery.ui.autocomplete.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.autocomplete.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.autocomplete.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.autocomplete.css diff --git a/core/misc/ui/themes/base/jquery.ui.base.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.base.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.base.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.base.css diff --git a/core/misc/ui/themes/base/jquery.ui.button.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.button.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.button.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.button.css diff --git a/core/misc/ui/themes/base/jquery.ui.core.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.core.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.core.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.core.css diff --git a/core/misc/ui/themes/base/jquery.ui.datepicker.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.datepicker.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.datepicker.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.datepicker.css diff --git a/core/misc/ui/themes/base/jquery.ui.dialog.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.dialog.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.dialog.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.dialog.css diff --git a/core/misc/ui/themes/base/jquery.ui.menu.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.menu.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.menu.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.menu.css diff --git a/core/misc/ui/themes/base/jquery.ui.progressbar.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.progressbar.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.progressbar.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.progressbar.css diff --git a/core/misc/ui/themes/base/jquery.ui.resizable.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.resizable.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.resizable.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.resizable.css diff --git a/core/misc/ui/themes/base/jquery.ui.selectable.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.selectable.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.selectable.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.selectable.css diff --git a/core/misc/ui/themes/base/jquery.ui.slider.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.slider.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.slider.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.slider.css diff --git a/core/misc/ui/themes/base/jquery.ui.spinner.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.spinner.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.spinner.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.spinner.css diff --git a/core/misc/ui/themes/base/jquery.ui.tabs.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.tabs.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.tabs.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.tabs.css diff --git a/core/misc/ui/themes/base/jquery.ui.theme.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.theme.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.theme.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.theme.css diff --git a/core/misc/ui/themes/base/jquery.ui.tooltip.css b/core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.tooltip.css similarity index 100% rename from core/misc/ui/themes/base/jquery.ui.tooltip.css rename to core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.tooltip.css diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-af.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-af.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ar-DZ.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ar-DZ.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ar.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ar.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-az.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-az.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-bg.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-bg.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-bs.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-bs.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ca.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ca.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-cs.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-cs.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-cy-GB.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-cy-GB.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-da.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-da.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-de.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-de.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-el.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-el.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-en-AU.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-en-NZ.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-eo.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-eo.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-es.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-es.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-et.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-et.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-eu.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-eu.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fa.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-fa.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fi.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-fi.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fo.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-fo.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fr-CH.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-fr-CH.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-fr.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-fr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ge.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ge.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-gl.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-gl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-he.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-he.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hi.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-hi.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hr.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-hr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hu.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-hu.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-hy.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-hy.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-id.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-id.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-is.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-is.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-it.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-it.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ja.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ja.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ka.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ka.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-kk.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-kk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-km.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-km.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ko.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ko.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-lb.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-lb.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-lt.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-lt.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-lv.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-lv.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-mk.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-mk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ml.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ml.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ms.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ms.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-nl-BE.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-nl-BE.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-nl.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-nl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-no.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-no.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-pl.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-pl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-pt-BR.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-pt-BR.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-pt.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-pt.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-rm.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-rm.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ro.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ro.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ru.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ru.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sk.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-sk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sl.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-sl.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sq.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-sq.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sr-SR.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-sr-SR.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sr.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-sr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-sv.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-sv.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-ta.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-ta.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-th.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-th.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-tj.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-tj.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-tr.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-tr.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-uk.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-uk.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-vi.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-vi.js diff --git a/core/misc/ui/ui/i18n/jquery.ui.datepicker-zh-CN.js b/core/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/ui/i18n/jquery.ui.datepicker-zh-TW.js diff --git a/core/misc/ui/ui/jquery.effects.blind.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.blind.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.blind.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.blind.js diff --git a/core/misc/ui/ui/jquery.effects.bounce.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.bounce.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.bounce.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.bounce.js diff --git a/core/misc/ui/ui/jquery.effects.clip.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.clip.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.clip.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.clip.js diff --git a/core/misc/ui/ui/jquery.effects.core.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.core.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.core.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.core.js diff --git a/core/misc/ui/ui/jquery.effects.drop.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.drop.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.drop.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.drop.js diff --git a/core/misc/ui/ui/jquery.effects.explode.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.explode.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.explode.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.explode.js diff --git a/core/misc/ui/ui/jquery.effects.fade.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.fade.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.fade.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.fade.js diff --git a/core/misc/ui/ui/jquery.effects.fold.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.fold.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.fold.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.fold.js diff --git a/core/misc/ui/ui/jquery.effects.highlight.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.highlight.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.highlight.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.highlight.js diff --git a/core/misc/ui/ui/jquery.effects.pulsate.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.pulsate.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.pulsate.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.pulsate.js diff --git a/core/misc/ui/ui/jquery.effects.scale.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.scale.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.scale.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.scale.js diff --git a/core/misc/ui/ui/jquery.effects.shake.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.shake.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.shake.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.shake.js diff --git a/core/misc/ui/ui/jquery.effects.slide.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.slide.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.slide.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.slide.js diff --git a/core/misc/ui/ui/jquery.effects.transfer.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.effects.transfer.js similarity index 100% rename from core/misc/ui/ui/jquery.effects.transfer.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.effects.transfer.js diff --git a/core/misc/ui/ui/jquery.ui.accordion.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.accordion.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.accordion.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.accordion.js diff --git a/core/misc/ui/ui/jquery.ui.autocomplete.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.autocomplete.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.autocomplete.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.autocomplete.js diff --git a/core/misc/ui/ui/jquery.ui.button.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.button.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.button.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.button.js diff --git a/core/misc/ui/ui/jquery.ui.core.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.core.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.core.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.core.js diff --git a/core/misc/ui/ui/jquery.ui.datepicker.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.datepicker.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.datepicker.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.datepicker.js diff --git a/core/misc/ui/ui/jquery.ui.dialog.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.dialog.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.dialog.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.dialog.js diff --git a/core/misc/ui/ui/jquery.ui.draggable.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.draggable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.draggable.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.draggable.js diff --git a/core/misc/ui/ui/jquery.ui.droppable.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.droppable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.droppable.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.droppable.js diff --git a/core/misc/ui/ui/jquery.ui.effect-blind.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-blind.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-blind.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-blind.js diff --git a/core/misc/ui/ui/jquery.ui.effect-bounce.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-bounce.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-bounce.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-bounce.js diff --git a/core/misc/ui/ui/jquery.ui.effect-clip.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-clip.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-clip.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-clip.js diff --git a/core/misc/ui/ui/jquery.ui.effect-drop.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-drop.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-drop.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-drop.js diff --git a/core/misc/ui/ui/jquery.ui.effect-explode.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-explode.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-explode.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-explode.js diff --git a/core/misc/ui/ui/jquery.ui.effect-fade.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-fade.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-fade.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-fade.js diff --git a/core/misc/ui/ui/jquery.ui.effect-fold.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-fold.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-fold.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-fold.js diff --git a/core/misc/ui/ui/jquery.ui.effect-highlight.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-highlight.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-highlight.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-highlight.js diff --git a/core/misc/ui/ui/jquery.ui.effect-pulsate.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-pulsate.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-pulsate.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-pulsate.js diff --git a/core/misc/ui/ui/jquery.ui.effect-scale.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-scale.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-scale.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-scale.js diff --git a/core/misc/ui/ui/jquery.ui.effect-shake.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-shake.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-shake.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-shake.js diff --git a/core/misc/ui/ui/jquery.ui.effect-slide.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-slide.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-slide.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-slide.js diff --git a/core/misc/ui/ui/jquery.ui.effect-transfer.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-transfer.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect-transfer.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect-transfer.js diff --git a/core/misc/ui/ui/jquery.ui.effect.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.effect.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.effect.js diff --git a/core/misc/ui/ui/jquery.ui.menu.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.menu.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.menu.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.menu.js diff --git a/core/misc/ui/ui/jquery.ui.mouse.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.mouse.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.mouse.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.mouse.js diff --git a/core/misc/ui/ui/jquery.ui.position.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.position.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.position.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.position.js diff --git a/core/misc/ui/ui/jquery.ui.progressbar.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.progressbar.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.progressbar.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.progressbar.js diff --git a/core/misc/ui/ui/jquery.ui.resizable.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.resizable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.resizable.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.resizable.js diff --git a/core/misc/ui/ui/jquery.ui.selectable.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.selectable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.selectable.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.selectable.js diff --git a/core/misc/ui/ui/jquery.ui.slider.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.slider.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.slider.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.slider.js diff --git a/core/misc/ui/ui/jquery.ui.sortable.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.sortable.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.sortable.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.sortable.js diff --git a/core/misc/ui/ui/jquery.ui.spinner.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.spinner.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.spinner.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.spinner.js diff --git a/core/misc/ui/ui/jquery.ui.tabs.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.tabs.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.tabs.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.tabs.js diff --git a/core/misc/ui/ui/jquery.ui.tooltip.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.tooltip.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.tooltip.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.tooltip.js diff --git a/core/misc/ui/ui/jquery.ui.widget.js b/core/js/vendor/jquery/jquery-ui/ui/jquery.ui.widget.js similarity index 100% rename from core/misc/ui/ui/jquery.ui.widget.js rename to core/js/vendor/jquery/jquery-ui/ui/jquery.ui.widget.js diff --git a/core/misc/jquery.js b/core/js/vendor/jquery/jquery/jquery.js similarity index 100% rename from core/misc/jquery.js rename to core/js/vendor/jquery/jquery/jquery.js diff --git a/core/misc/jquery.form.js b/core/js/vendor/malsup/form/jquery.form.js similarity index 100% rename from core/misc/jquery.form.js rename to core/js/vendor/malsup/form/jquery.form.js diff --git a/core/misc/farbtastic/farbtastic.css b/core/js/vendor/mattfarina/farbtastic/farbtastic.css similarity index 100% rename from core/misc/farbtastic/farbtastic.css rename to core/js/vendor/mattfarina/farbtastic/farbtastic.css diff --git a/core/misc/farbtastic/farbtastic.js b/core/js/vendor/mattfarina/farbtastic/farbtastic.js similarity index 100% rename from core/misc/farbtastic/farbtastic.js rename to core/js/vendor/mattfarina/farbtastic/farbtastic.js diff --git a/core/misc/farbtastic/marker.png b/core/js/vendor/mattfarina/farbtastic/marker.png similarity index 100% rename from core/misc/farbtastic/marker.png rename to core/js/vendor/mattfarina/farbtastic/marker.png diff --git a/core/misc/farbtastic/mask.png b/core/js/vendor/mattfarina/farbtastic/mask.png similarity index 100% rename from core/misc/farbtastic/mask.png rename to core/js/vendor/mattfarina/farbtastic/mask.png diff --git a/core/misc/farbtastic/wheel.png b/core/js/vendor/mattfarina/farbtastic/wheel.png similarity index 100% rename from core/misc/farbtastic/wheel.png rename to core/js/vendor/mattfarina/farbtastic/wheel.png diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc index aa018da..18001ba 100644 --- a/core/modules/block/block.admin.inc +++ b/core/modules/block/block.admin.inc @@ -82,7 +82,7 @@ function block_admin_display_prepare_blocks($theme) { function block_admin_display_form($form, &$form_state, $blocks, $theme, $block_regions = NULL) { $path = drupal_get_path('module', 'block'); $form['#attached']['css'][] = $path . '/block.admin.css'; - $form['#attached']['js'][] = 'core/misc/tableheader.js'; + $form['#attached']['js'][] = 'core/js/src/lib/tableheader.js'; $form['#attached']['js'][] = $path . '/block.js'; // Get a list of block regions if one was not provided. diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index 1bb4547..af6adf7 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -222,7 +222,7 @@ function node_filter_form() { $form['filters']['status']['actions']['reset'] = array('#type' => 'submit', '#value' => t('Reset')); } - drupal_add_js('core/misc/form.js'); + drupal_add_js('core/js/src/lib/form.js'); return $form; } diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index 38c360b..ef603ff 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/js/src/lib/tableselect.js', $javascript)) { + $javascript[$simpletest]['weight'] = $javascript['core/js/src/lib/tableselect.js']['weight'] - 1; } } diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc index a98b445..5b8bc18 100644 --- a/core/modules/simpletest/simpletest.pages.inc +++ b/core/modules/simpletest/simpletest.pages.inc @@ -70,7 +70,7 @@ function theme_simpletest_test_table($variables) { drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css'); drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js'); - drupal_add_js('core/misc/tableselect.js'); + drupal_add_js('core/js/src/lib/tableselect.js'); // Create header for test selection table. $header = array( 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 ea1a749..f3280ef 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php @@ -60,11 +60,11 @@ 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/jquery.js', $javascript), t('jQuery is added when a file is added.')); - $this->assertTrue(array_key_exists('core/misc/drupal.js', $javascript), t('Drupal.js is added when file is added.')); - $this->assertTrue(array_key_exists('core/misc/html5.js', $javascript), t('html5.js is added when file is added.')); - $this->assertTrue(array_key_exists('core/misc/collapse.js', $javascript), t('JavaScript files are correctly added.')); + $javascript = drupal_add_js('core/js/src/lib/collapse.js'); + $this->assertTrue(array_key_exists('core/vendor/jquery/jquery/jquery.js', $javascript), t('jQuery is added when a file is added.')); + $this->assertTrue(array_key_exists('core/js/src/drupal.js', $javascript), t('Drupal.js is added when file is added.')); + $this->assertTrue(array_key_exists('core/vendor/aFarkas/html5shiv/html5.js', $javascript), t('html5.js is added when file is added.')); + $this->assertTrue(array_key_exists('core/js/src/lib/collapse.js', $javascript), t('JavaScript files are correctly added.')); $this->assertEqual(base_path(), $javascript['settings']['data'][0]['basePath'], t('Base path JavaScript setting is correctly set.')); $this->assertIdentical($GLOBALS['script_path'], $javascript['settings']['data'][1]['scriptPath'], t('Script path JavaScript setting is correctly set.')); $this->assertIdentical('', $javascript['settings']['data'][2]['pathPrefix'], t('Path prefix JavaScript setting is correctly set.')); @@ -95,11 +95,11 @@ class JavaScriptTest extends WebTestBase { $default_query_string = variable_get('css_js_query_string', '0'); 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/js/src/lib/collapse.js', array('async' => TRUE)); $javascript = drupal_get_js(); $expected_1 = ''; - $expected_2 = ''; + $expected_2 = ''; $this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered external JavaScript with correct async attribute.')); $this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered internal JavaScript with correct async attribute.')); @@ -112,11 +112,11 @@ class JavaScriptTest extends WebTestBase { $default_query_string = variable_get('css_js_query_string', '0'); 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/js/src/lib/collapse.js', array('defer' => TRUE)); $javascript = drupal_get_js(); $expected_1 = ''; - $expected_2 = ''; + $expected_2 = ''; $this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered external JavaScript with correct defer attribute.')); $this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered internal JavaScript with correct defer attribute.')); @@ -141,7 +141,7 @@ class JavaScriptTest extends WebTestBase { $this->assertTrue(strpos($javascript, 'basePath') > 0, t('Rendered JavaScript header returns basePath setting.')); $this->assertTrue(strpos($javascript, 'scriptPath') > 0, t('Rendered JavaScript header returns scriptPath setting.')); $this->assertTrue(strpos($javascript, 'pathPrefix') > 0, t('Rendered JavaScript header returns pathPrefix setting.')); - $this->assertTrue(strpos($javascript, 'core/misc/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.')); + $this->assertTrue(strpos($javascript, 'core/js/vendor/jquery/jquery/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.')); // Test whether drupal_add_js can be used to override a previous setting. $this->assertTrue(strpos($javascript, 'commonTestShouldAppear') > 0, t('Rendered JavaScript header returns custom setting.')); @@ -162,7 +162,7 @@ class JavaScriptTest extends WebTestBase { * Test to see if resetting the JavaScript empties the cache. */ function testReset() { - drupal_add_js('core/misc/collapse.js'); + drupal_add_js('core/js/src/lib/collapse.js'); drupal_static_reset('drupal_add_js'); $this->assertEqual(array(), drupal_add_js(), t('Resetting the JavaScript correctly empties the cache.')); } @@ -173,7 +173,7 @@ class JavaScriptTest extends WebTestBase { function testAddInline() { $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/js/vendor/jquery/jquery/jquery.js', $javascript), t('jQuery is added when inline scripts are added.')); $data = end($javascript); $this->assertEqual($inline, $data['data'], t('Inline JavaScript is correctly added to the footer.')); } @@ -203,24 +203,24 @@ class JavaScriptTest extends WebTestBase { * Test drupal_add_js() sets preproccess to false when cache is set to false. */ function testNoCache() { - $javascript = drupal_add_js('core/misc/collapse.js', array('cache' => FALSE)); - $this->assertFalse($javascript['core/misc/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.')); + $javascript = drupal_add_js('core/js/src/lib/collapse.js', array('cache' => FALSE)); + $this->assertFalse($javascript['core/js/src/lib/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.')); } /** * Test adding a JavaScript file with a different group. */ function testDifferentGroup() { - $javascript = drupal_add_js('core/misc/collapse.js', array('group' => JS_THEME)); - $this->assertEqual($javascript['core/misc/collapse.js']['group'], JS_THEME, t('Adding a JavaScript file with a different group caches the given group.')); + $javascript = drupal_add_js('core/js/src/lib/collapse.js', array('group' => JS_THEME)); + $this->assertEqual($javascript['core/js/src/lib/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, t('Adding a JavaScript file with a different weight caches the given weight.')); + $javascript = drupal_add_js('core/js/src/lib/collapse.js', array('weight' => 2)); + $this->assertEqual($javascript['core/js/src/lib/collapse.js']['weight'], 2, t('Adding a JavaScript file with a different weight caches the given weight.')); } /** @@ -231,11 +231,11 @@ class JavaScriptTest extends WebTestBase { function testBrowserConditionalComments() { $default_query_string = variable_get('css_js_query_string', '0'); - drupal_add_js('core/misc/collapse.js', array('browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE))); + drupal_add_js('core/js/src/lib/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, t('Rendered JavaScript within downlevel-hidden conditional comments.')); @@ -246,10 +246,10 @@ class JavaScriptTest extends WebTestBase { * Test JavaScript versioning. */ function testVersionQueryString() { - drupal_add_js('core/misc/collapse.js', array('version' => 'foo')); - drupal_add_js('core/misc/ajax.js', array('version' => 'bar')); + drupal_add_js('core/js/src/lib/collapse.js', array('version' => 'foo')); + drupal_add_js('core/js/src/lib/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 , t('JavaScript version identifiers correctly appended to URLs')); + $this->assertTrue(strpos($javascript, 'core/js/src/lib/collapse.js?v=foo') > 0 && strpos($javascript, 'core/js/src/lib/ajax.js?v=bar') > 0 , t('JavaScript version identifiers correctly appended to URLs')); } /** @@ -262,16 +262,16 @@ class JavaScriptTest extends WebTestBase { // ahead of ones without. The order of JavaScript execution must be the // same regardless of whether aggregation is enabled, so ensure this // expected order, first with aggregation off. - 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/js/src/lib/ajax.js'); + drupal_add_js('core/js/src/lib/collapse.js', array('every_page' => TRUE)); + drupal_add_js('core/js/src/lib/autocomplete.js'); + drupal_add_js('core/js/src/lib/batch.js', array('every_page' => TRUE)); $javascript = drupal_get_js(); $expected = implode("\n", array( - '', - '', - '', - '', + '', + '', + '', + '', )); $this->assertTrue(strpos($javascript, $expected) > 0, t('Unaggregated JavaScript is added in the expected group order.')); @@ -281,15 +281,15 @@ class JavaScriptTest extends WebTestBase { $config = config('system.performance'); $config->set('preprocess_js', 1); $config->save(); - 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/js/src/lib/ajax.js'); + drupal_add_js('core/js/src/lib/collapse.js', array('every_page' => TRUE)); + drupal_add_js('core/js/src/lib/autocomplete.js'); + drupal_add_js('core/js/src/lib/batch.js', array('every_page' => TRUE)); $js_items = drupal_add_js(); $javascript = drupal_get_js(); $expected = implode("\n", array( - '', - '', + '', + '', )); $this->assertTrue(strpos($javascript, $expected) > 0, t('JavaScript is aggregated in the expected groups and order.')); } @@ -303,13 +303,13 @@ class JavaScriptTest extends WebTestBase { drupal_static_reset('drupal_add_js'); // Add two JavaScript files to the current request and build the cache. - drupal_add_js('core/misc/ajax.js'); - drupal_add_js('core/misc/autocomplete.js'); + drupal_add_js('core/js/src/lib/ajax.js'); + drupal_add_js('core/js/src/lib/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/js/src/lib/ajax.js' => $js_items['core/js/src/lib/ajax.js'], + 'core/js/src/lib/autocomplete.js' => $js_items['core/js/src/lib/autocomplete.js'] )); // Store the expected key for the first item in the cache. @@ -320,14 +320,14 @@ class JavaScriptTest extends WebTestBase { variable_del('drupal_js_cache_files'); drupal_static_reset('drupal_add_js'); 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/js/src/lib/ajax.js'); + drupal_add_js('core/js/src/lib/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/js/src/lib/ajax.js' => $js_items['core/js/src/lib/ajax.js'], + 'core/js/src/lib/autocomplete.js' => $js_items['core/js/src/lib/autocomplete.js'] )); // Compare the expected key for the first file to the current one. @@ -385,9 +385,9 @@ class JavaScriptTest extends WebTestBase { // JavaScript files are sorted first by group, then by the 'every_page' // 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_js('core/misc/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21)); + drupal_add_js('core/js/src/lib/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'), t('Rendering a JavaScript file above jQuery.')); + $this->assertTrue(strpos($javascript, 'core/js/src/lib/collapse.js') < strpos($javascript, 'core/js/vendor/jquery/jquery/jquery.js'), t('Rendering a JavaScript file above jQuery.')); } /** @@ -397,14 +397,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/js/src/lib/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'), t('Altering JavaScript weight through the alter hook.')); + $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/js/src/lib/tableselect.js'), t('Altering JavaScript weight through the alter hook.')); } /** @@ -415,8 +415,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'), t('JavaScript of library was added to the page.')); - $this->assertTrue(strpos($styles, 'core/misc/farbtastic/farbtastic.css'), t('Stylesheet of library was added to the page.')); + $this->assertTrue(strpos($scripts, 'core/js/vendor/mattfarina/farbtastic/farbtastic.js'), t('JavaScript of library was added to the page.')); + $this->assertTrue(strpos($styles, 'core/js/vendor/mattfarina/farbtastic/farbtastic.css'), t('Stylesheet of library was added to the page.')); } /** @@ -432,7 +432,7 @@ class JavaScriptTest extends WebTestBase { // common_test_library_info_alter() also added a dependency on jQuery Form. drupal_add_library('system', 'farbtastic'); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'core/misc/jquery.form.js'), t('Altered library dependencies are added to the page.')); + $this->assertTrue(strpos($scripts, 'core/vendor/malsup/form/jquery.form.js'), t('Altered library dependencies are added to the page.')); } /** @@ -466,7 +466,7 @@ class JavaScriptTest extends WebTestBase { $element['#attached']['library'][] = array('system', 'farbtastic'); drupal_render($element); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), t('The attached_library property adds the additional libraries.')); + $this->assertTrue(strpos($scripts, 'core/vendor/mattfarina/farbtastic/farbtastic.js'), t('The attached_library property adds the additional libraries.')); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php b/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php index acfa062..94cb611 100644 --- a/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php @@ -41,7 +41,7 @@ class DownloadTest extends FileTestBase { // 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/js/vendor/jquery/jquery/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/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php index eb0d99a..247dd50 100644 --- a/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php @@ -32,7 +32,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/js/vendor/jquery/jquery/jquery.js'; $url = file_create_url($filepath); $this->assertEqual(FILE_URL_TEST_CDN_1 . '/' . $filepath, $url, t('Correctly generated a CDN URL for a shipped file.')); $filepath = 'core/misc/favicon.ico'; @@ -41,7 +41,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/js/vendor/jquery/jquery/jquery.js'; $url = file_create_url($filepath); $this->assertEqual(base_path() . '/' . $filepath, $url, t('Correctly generated a root-relative URL for a shipped file.')); $filepath = 'core/misc/favicon.ico'; @@ -50,7 +50,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/js/vendor/jquery/jquery/jquery.js'; $url = file_create_url($filepath); $this->assertEqual('/' . base_path() . '/' . $filepath, $url, t('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/File/ValidatorTest.php b/core/modules/system/lib/Drupal/system/Tests/File/ValidatorTest.php index 3f8e548..10c7aee 100644 --- a/core/modules/system/lib/Drupal/system/Tests/File/ValidatorTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/File/ValidatorTest.php @@ -29,7 +29,7 @@ class ValidatorTest extends WebTestBase { $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/js/vendor/jquery/jquery/jquery.js'; $this->non_image->filename = drupal_basename($this->non_image->uri); } 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 b517ffc..3032f23 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php @@ -33,8 +33,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/js/src/lib/vertical-tabs.js'); + $position2 = strpos($this->content, 'core/js/src/lib/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..04b95e6 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/js/src/lib/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/js/src/lib/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 f7a0e35..19e8347 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -306,7 +306,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/js/vendor/jquery/jquery/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 75b1fa2..aa14e38 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1209,7 +1209,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/js/src/lib/ajax.js' => array('group' => JS_LIBRARY, 'weight' => 2), ), 'dependencies' => array( array('system', 'drupal.progress'), @@ -1221,7 +1221,7 @@ function system_library_info() { 'title' => 'Drupal batch API', 'version' => VERSION, 'js' => array( - 'core/misc/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), + 'core/js/src/lib/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), ), 'dependencies' => array( array('system', 'drupal.progress'), @@ -1233,7 +1233,7 @@ function system_library_info() { 'title' => 'Drupal progress indicator', 'version' => VERSION, 'js' => array( - 'core/misc/progress.js' => array('group' => JS_DEFAULT), + 'core/js/src/lib/progress.js' => array('group' => JS_DEFAULT), ), ); @@ -1242,7 +1242,7 @@ function system_library_info() { 'title' => 'Drupal form library', 'version' => VERSION, 'js' => array( - 'core/misc/form.js' => array('group' => JS_LIBRARY, 'weight' => 1), + 'core/js/src/lib/form.js' => array('group' => JS_LIBRARY, 'weight' => 1), ), ); @@ -1251,7 +1251,7 @@ function system_library_info() { 'title' => 'Drupal states', 'version' => VERSION, 'js' => array( - 'core/misc/states.js' => array('group' => JS_LIBRARY, 'weight' => 1), + 'core/js/src/lib/states.js' => array('group' => JS_LIBRARY, 'weight' => 1), ), ); @@ -1260,7 +1260,7 @@ function system_library_info() { 'title' => 'Drupal tabledrag', 'version' => VERSION, 'js' => array( - 'core/misc/tabledrag.js' => array('group' => JS_LIBRARY, 'weight' => -1), + 'core/js/src/lib/tabledrag.js' => array('group' => JS_LIBRARY, 'weight' => -1), ), 'dependencies' => array( array('system', 'jquery.cookie'), @@ -1272,7 +1272,7 @@ function system_library_info() { 'title' => 'Drupal collapsible fieldset', 'version' => VERSION, 'js' => array( - 'core/misc/collapse.js' => array('group' => JS_DEFAULT), + 'core/js/src/lib/collapse.js' => array('group' => JS_DEFAULT), ), 'dependencies' => array( // collapse.js relies on drupalGetSummary in form.js @@ -1285,7 +1285,7 @@ function system_library_info() { 'title' => 'Drupal autocomplete', 'version' => VERSION, 'js' => array( - 'core/misc/autocomplete.js' => array('group' => JS_DEFAULT), + 'core/js/src/lib/autocomplete.js' => array('group' => JS_DEFAULT), ), ); @@ -1295,7 +1295,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/js/vendor/jquery/jquery/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20), ), ); @@ -1305,7 +1305,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/js/src/lib/jquery.once.js' => array('group' => JS_LIBRARY, 'weight' => -19), ), ); @@ -1315,7 +1315,7 @@ function system_library_info() { 'website' => 'http://malsup.com/jquery/form/', 'version' => '2.87', 'js' => array( - 'core/misc/jquery.form.js' => array(), + 'core/js/vendor/malsup/form/jquery.form.js' => array(), ), 'dependencies' => array( array('system', 'jquery.cookie'), @@ -1328,7 +1328,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/js/vendor/cowboy/jquery-bbq/jquery.ba-bbq.js' => array(), ), ); @@ -1338,10 +1338,10 @@ function system_library_info() { 'website' => 'http://drupal.org/node/323112', 'version' => '1.0', 'js' => array( - 'core/misc/vertical-tabs.js' => array(), + 'core/js/src/lib/vertical-tabs.js' => array(), ), 'css' => array( - 'core/misc/vertical-tabs.css' => array(), + 'core/js/src/lib/vertical-tabs.css' => array(), ), 'dependencies' => array( // Vertical tabs relies on drupalGetSummary in form.js @@ -1355,10 +1355,10 @@ function system_library_info() { 'website' => 'http://code.google.com/p/farbtastic/', 'version' => '1.2', 'js' => array( - 'core/misc/farbtastic/farbtastic.js' => array(), + 'core/js/vendor/mattfarina/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'core/misc/farbtastic/farbtastic.css' => array(), + 'core/js/vendor/mattfarina/farbtastic/farbtastic.css' => array(), ), ); @@ -1368,7 +1368,7 @@ function system_library_info() { 'website' => 'http://code.google.com/p/html5shiv/', 'version' => '11', 'js' => array( - 'core/misc/html5.js' => array( + 'core/vendor/aFarkas/html5shiv/html5.js' => array( 'group' => JS_LIBRARY, 'weight' => -21, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), @@ -1382,11 +1382,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/js/vendor/jquery/jquery-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/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.core.css' => array(), + 'core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.theme.css' => array(), ), ); $libraries['jquery.ui.accordion'] = array( @@ -1394,10 +1394,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.accordion.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.accordion.css' => array(), + 'core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.accordion.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1409,10 +1409,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.autocomplete.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.autocomplete.css' => array(), + 'core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.autocomplete.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1426,10 +1426,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.button.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.button.css' => array(), + 'core/js/vendor/jquery/jquery-ui/themes/base/jquery.ui.button.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1441,10 +1441,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.datepicker.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.datepicker.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.datepicker.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1455,10 +1455,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.dialog.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.dialog.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.dialog.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1475,7 +1475,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.draggable.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1488,7 +1488,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.droppable.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1502,10 +1502,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.menu.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.menu.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.menu.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1517,7 +1517,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.mouse.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.widget'), @@ -1528,7 +1528,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.position.js' => array(), ), ); $libraries['jquery.ui.progressbar'] = array( @@ -1536,10 +1536,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.progressbar.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.progressbar.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.progressbar.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1551,10 +1551,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.resizable.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.resizable.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.resizable.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1567,10 +1567,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.selectable.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.selectable.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.selectable.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1583,10 +1583,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.slider.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.slider.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.slider.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1599,7 +1599,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.sortable.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1612,7 +1612,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.spinner.js' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1625,10 +1625,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.tabs.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.tabs.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.tabs.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1640,10 +1640,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.tooltip.js' => array(), ), 'css' => array( - 'core/misc/ui/themes/base/jquery.ui.tooltip.css' => array(), + 'core/js/vendor/jquery/jquery-ui//themes/base/jquery.ui.tooltip.css' => array(), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1656,7 +1656,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/js/vendor/jquery/jquery-ui/ui/jquery.ui.widget.js' => array('group' => JS_LIBRARY, 'weight' => -10), ), 'dependencies' => array( array('system', 'jquery.ui.core'), @@ -1667,7 +1667,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.core.js' => array('group' => JS_LIBRARY, 'weight' => -9), ), ); $libraries['jquery.effects.blind'] = array( @@ -1675,7 +1675,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.blind.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1686,7 +1686,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.bounce.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1697,7 +1697,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.clip.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1708,7 +1708,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.drop.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1719,7 +1719,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.explode.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1730,7 +1730,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.fade.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1741,7 +1741,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.fold.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1752,7 +1752,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.highlight.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1763,7 +1763,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.pulsate.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1774,7 +1774,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.scale.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1785,7 +1785,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.shake.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1796,7 +1796,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.slide.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1807,7 +1807,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/js/vendor/jquery/jquery-ui/ui/jquery.effects.transfer.js' => array(), ), 'dependencies' => array( array('system', 'jquery.effects.core'), @@ -1820,7 +1820,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/js/vendor/jquery/jquery-ui/external/jquery.cookie.js' => array(), ), ); 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 187fee5..11c5d8b 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/js/vendor/mattfarina/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'core/misc/farbtastic/farbtastic.css' => array(), + 'core/js/vendor/mattfarina/farbtastic/farbtastic.css' => array(), ), ); return $libraries; diff --git a/core/modules/system/tests/upgrade/drupal-7.language.database.php b/core/modules/system/tests/upgrade/drupal-7.language.database.php index 5687361..bd48130 100644 --- a/core/modules/system/tests/upgrade/drupal-7.language.database.php +++ b/core/modules/system/tests/upgrade/drupal-7.language.database.php @@ -124,7 +124,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '1', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'An AJAX HTTP error occurred.', 'context' => '', @@ -132,7 +132,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '2', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'HTTP Result Code: !status', 'context' => '', @@ -140,7 +140,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '3', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'An AJAX HTTP request terminated abnormally.', 'context' => '', @@ -148,7 +148,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '4', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'Debugging information follows.', 'context' => '', @@ -156,7 +156,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '5', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'Path: !uri', 'context' => '', @@ -164,7 +164,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '6', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'StatusText: !statusText', 'context' => '', @@ -172,7 +172,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '7', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'ResponseText: !responseText', 'context' => '', @@ -180,7 +180,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '8', - 'location' => 'misc/drupal.js', + 'location' => 'js/src/drupal.js', 'textgroup' => 'default', 'source' => 'ReadyState: !readyState', 'context' => '', @@ -244,7 +244,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '16', - 'location' => 'misc/tabledrag.js', + 'location' => 'js/src/lib/tabledrag.js', 'textgroup' => 'default', 'source' => 'Show row weights', 'context' => '', @@ -252,7 +252,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '17', - 'location' => 'misc/tabledrag.js', + 'location' => 'js/src/lib/tabledrag.js', 'textgroup' => 'default', 'source' => 'Hide row weights', 'context' => '', @@ -260,7 +260,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '18', - 'location' => 'misc/tabledrag.js', + 'location' => 'js/src/lib/tabledrag.js', 'textgroup' => 'default', 'source' => 'Drag to re-order', 'context' => '', @@ -268,7 +268,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '19', - 'location' => 'misc/tabledrag.js', + 'location' => 'js/src/lib/tabledrag.js', 'textgroup' => 'default', 'source' => 'Changes made in this table will not be saved until the form is submitted.', 'context' => '', @@ -276,7 +276,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '20', - 'location' => 'misc/collapse.js', + 'location' => 'js/src/lib/collapse.js', 'textgroup' => 'default', 'source' => 'Hide', 'context' => '', @@ -284,7 +284,7 @@ db_insert('locales_source')->fields(array( )) ->values(array( 'lid' => '21', - 'location' => 'misc/collapse.js', + 'location' => 'js/src/lib/collapse.js', 'textgroup' => 'default', 'source' => 'Show', 'context' => '', @@ -384,7 +384,7 @@ db_insert('variable')->fields(array( )) ->values(array( 'name' => 'javascript_parsed', - 'value' => 'a:16:{i:0;s:14:"misc/drupal.js";i:1;s:14:"misc/jquery.js";i:2;s:19:"misc/jquery.once.js";s:10:"refresh:ca";s:7:"waiting";i:3;s:29:"misc/ui/jquery.ui.core.min.js";i:4;s:21:"misc/jquery.ba-bbq.js";i:5;s:33:"modules/overlay/overlay-parent.js";i:6;s:32:"modules/contextual/contextual.js";i:7;s:21:"misc/jquery.cookie.js";i:8;s:26:"modules/toolbar/toolbar.js";i:9;s:32:"modules/overlay/overlay-child.js";i:10;s:19:"misc/tableheader.js";i:11;s:17:"misc/tabledrag.js";i:12;s:12:"misc/form.js";i:13;s:16:"misc/collapse.js";s:10:"refresh:cv";s:7:"waiting";}', + 'value' => 'a:16:{i:0;s:16:"js/src/drupal.js";i:1;s:14:"misc/jquery.js";i:2;s:19:"misc/jquery.once.js";s:10:"refresh:ca";s:7:"waiting";i:3;s:29:"misc/ui/jquery.ui.core.min.js";i:4;s:21:"misc/jquery.ba-bbq.js";i:5;s:33:"modules/overlay/overlay-parent.js";i:6;s:32:"modules/contextual/contextual.js";i:7;s:21:"misc/jquery.cookie.js";i:8;s:26:"modules/toolbar/toolbar.js";i:9;s:32:"modules/overlay/overlay-child.js";i:10;s:19:"misc/tableheader.js";i:11;s:23:"js/src/lib/tabledrag.js";i:12;s:12:"misc/form.js";i:13;s:22:"js/src/lib/collapse.js";s:10:"refresh:cv";s:7:"waiting";}', )) ->values(array( 'name' => 'language_count',