diff --git a/core/includes/common.inc b/core/includes/common.inc
index 17e1363..0260cfe 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -3827,7 +3827,7 @@ function drupal_add_js($data = NULL, $options = NULL) {
'browsers' => array(),
),
'core/misc/drupal.js' => array(
- 'data' => 'core/misc/drupal.js',
+ 'data' => 'core/modules/system/assets/drupal.js',
'type' => 'file',
'scope' => 'header',
'group' => JS_LIBRARY,
diff --git a/core/misc/ajax.js b/core/modules/system/assets/ajax.js
similarity index 100%
rename from core/misc/ajax.js
rename to core/modules/system/assets/ajax.js
diff --git a/core/misc/autocomplete.js b/core/modules/system/assets/autocomplete.js
similarity index 100%
rename from core/misc/autocomplete.js
rename to core/modules/system/assets/autocomplete.js
diff --git a/core/misc/batch.js b/core/modules/system/assets/batch.js
similarity index 100%
rename from core/misc/batch.js
rename to core/modules/system/assets/batch.js
diff --git a/core/misc/collapse.js b/core/modules/system/assets/collapse.js
similarity index 100%
rename from core/misc/collapse.js
rename to core/modules/system/assets/collapse.js
diff --git a/core/misc/drupal.js b/core/modules/system/assets/drupal.js
similarity index 100%
rename from core/misc/drupal.js
rename to core/modules/system/assets/drupal.js
diff --git a/core/misc/form.js b/core/modules/system/assets/form.js
similarity index 100%
rename from core/misc/form.js
rename to core/modules/system/assets/form.js
diff --git a/core/misc/html5.js b/core/modules/system/assets/html5.js
similarity index 100%
rename from core/misc/html5.js
rename to core/modules/system/assets/html5.js
diff --git a/core/misc/jquery.ba-bbq.js b/core/modules/system/assets/jquery.ba-bbq.js
similarity index 100%
rename from core/misc/jquery.ba-bbq.js
rename to core/modules/system/assets/jquery.ba-bbq.js
diff --git a/core/misc/jquery.form.js b/core/modules/system/assets/jquery.form.js
similarity index 100%
rename from core/misc/jquery.form.js
rename to core/modules/system/assets/jquery.form.js
diff --git a/core/misc/jquery.js b/core/modules/system/assets/jquery.js
similarity index 100%
rename from core/misc/jquery.js
rename to core/modules/system/assets/jquery.js
diff --git a/core/misc/jquery.once.js b/core/modules/system/assets/jquery.once.js
similarity index 100%
rename from core/misc/jquery.once.js
rename to core/modules/system/assets/jquery.once.js
diff --git a/core/misc/machine-name.js b/core/modules/system/assets/machine-name.js
similarity index 100%
rename from core/misc/machine-name.js
rename to core/modules/system/assets/machine-name.js
diff --git a/core/misc/progress.js b/core/modules/system/assets/progress.js
similarity index 100%
rename from core/misc/progress.js
rename to core/modules/system/assets/progress.js
diff --git a/core/misc/states.js b/core/modules/system/assets/states.js
similarity index 100%
rename from core/misc/states.js
rename to core/modules/system/assets/states.js
diff --git a/core/misc/tabledrag.js b/core/modules/system/assets/tabledrag.js
similarity index 100%
rename from core/misc/tabledrag.js
rename to core/modules/system/assets/tabledrag.js
diff --git a/core/misc/tableheader.js b/core/modules/system/assets/tableheader.js
similarity index 100%
rename from core/misc/tableheader.js
rename to core/modules/system/assets/tableheader.js
diff --git a/core/misc/tableselect.js b/core/modules/system/assets/tableselect.js
similarity index 100%
rename from core/misc/tableselect.js
rename to core/modules/system/assets/tableselect.js
diff --git a/core/misc/timezone.js b/core/modules/system/assets/timezone.js
similarity index 100%
rename from core/misc/timezone.js
rename to core/modules/system/assets/timezone.js
diff --git a/core/misc/vertical-tabs.js b/core/modules/system/assets/vertical-tabs.js
similarity index 100%
rename from core/misc/vertical-tabs.js
rename to core/modules/system/assets/vertical-tabs.js
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
index 1b07174..213965e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
@@ -67,11 +67,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/modules/system/assets/collapse.js');
+ $this->assertTrue(array_key_exists('core/modules/system/assets/jquery.js', $javascript), t('jQuery is added when a file is added.'));
+ $this->assertTrue(array_key_exists('core/modules/system/assets/drupal.js', $javascript), t('Drupal.js is added when file is added.'));
+ $this->assertTrue(array_key_exists('core/modules/system/assets/html5.js', $javascript), t('html5.js is added when file is added.'));
+ $this->assertTrue(array_key_exists('core/modules/system/assets/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.'));
@@ -82,7 +82,7 @@ class JavaScriptTest extends WebTestBase {
*/
function testAddSetting() {
// Add a file in order to test default settings.
- $javascript = drupal_add_js('core/misc/collapse.js');
+ $javascript = drupal_add_js('core/modules/system/assets/collapse.js');
$last_settings = end($javascript['settings']['data']);
$this->assertTrue($last_settings['currentPath'], 'The current path JavaScript setting is set correctly.');
@@ -108,11 +108,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/modules/system/assets/collapse.js', array('async' => TRUE));
$javascript = drupal_get_js();
$expected_1 = '';
- $expected_2 = '';
+ $expected_2 = '';
$this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered external JavaScript with correct async attribute.'));
$this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered internal JavaScript with correct async attribute.'));
@@ -125,11 +125,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/modules/system/assets/collapse.js', array('defer' => TRUE));
$javascript = drupal_get_js();
$expected_1 = '';
- $expected_2 = '';
+ $expected_2 = '';
$this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered external JavaScript with correct defer attribute.'));
$this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered internal JavaScript with correct defer attribute.'));
@@ -155,7 +155,7 @@ class JavaScriptTest extends WebTestBase {
$this->assertTrue(strpos($javascript, 'scriptPath') > 0, 'Rendered JavaScript header returns scriptPath setting.');
$this->assertTrue(strpos($javascript, 'pathPrefix') > 0, 'Rendered JavaScript header returns pathPrefix setting.');
$this->assertTrue(strpos($javascript, 'currentPath') > 0, 'Rendered JavaScript header returns currentPath setting.');
- $this->assertTrue(strpos($javascript, 'core/misc/jquery.js') > 0, 'Rendered JavaScript header includes jQuery.');
+ $this->assertTrue(strpos($javascript, 'core/modules/system/assets/jquery.js') > 0, '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.'));
@@ -183,7 +183,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/modules/system/assets/collapse.js');
drupal_static_reset('drupal_add_js');
$this->assertEqual(array(), drupal_add_js(), t('Resetting the JavaScript correctly empties the cache.'));
}
@@ -194,7 +194,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/modules/system/assets/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.'));
}
@@ -224,24 +224,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/modules/system/assets/collapse.js', array('cache' => FALSE));
+ $this->assertFalse($javascript['core/modules/system/assets/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.'));
}
/**
* 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/modules/system/assets/collapse.js', array('group' => JS_THEME));
+ $this->assertEqual($javascript['core/modules/system/assets/collapse.js']['group'], JS_THEME, t('Adding a JavaScript file with a different group caches the given group.'));
}
/**
* Test adding a JavaScript file with a different weight.
*/
function testDifferentWeight() {
- $javascript = drupal_add_js('core/misc/collapse.js', array('weight' => 2));
- $this->assertEqual($javascript['core/misc/collapse.js']['weight'], 2, t('Adding a JavaScript file with a different weight caches the given weight.'));
+ $javascript = drupal_add_js('core/modules/system/assets/collapse.js', array('weight' => 2));
+ $this->assertEqual($javascript['core/modules/system/assets/collapse.js']['weight'], 2, t('Adding a JavaScript file with a different weight caches the given weight.'));
}
/**
@@ -252,11 +252,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/modules/system/assets/collapse.js', array('browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE)));
drupal_add_js('jQuery(function () { });', array('type' => 'inline', 'browsers' => array('IE' => FALSE)));
$javascript = drupal_get_js();
- $expected_1 = "";
+ $expected_1 = "";
$expected_2 = "\n" . '' . "\n";
$this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered JavaScript within downlevel-hidden conditional comments.'));
@@ -267,10 +267,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/modules/system/assets/collapse.js', array('version' => 'foo'));
+ drupal_add_js('core/modules/system/assets/ajax.js', array('version' => 'bar'));
$javascript = drupal_get_js();
- $this->assertTrue(strpos($javascript, 'core/misc/collapse.js?v=foo') > 0 && strpos($javascript, 'core/misc/ajax.js?v=bar') > 0 , t('JavaScript version identifiers correctly appended to URLs'));
+ $this->assertTrue(strpos($javascript, 'core/modules/system/assets/collapse.js?v=foo') > 0 && strpos($javascript, 'core/modules/system/assets/ajax.js?v=bar') > 0 , t('JavaScript version identifiers correctly appended to URLs'));
}
/**
@@ -283,16 +283,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/modules/system/assets/ajax.js');
+ drupal_add_js('core/modules/system/assets/collapse.js', array('every_page' => TRUE));
+ drupal_add_js('core/modules/system/assets/autocomplete.js');
+ drupal_add_js('core/modules/system/assets/batch.js', array('every_page' => TRUE));
$javascript = drupal_get_js();
$expected = implode("\n", array(
- '',
- '',
- '',
- '',
+ '',
+ '',
+ '',
+ '',
));
$this->assertTrue(strpos($javascript, $expected) > 0, t('Unaggregated JavaScript is added in the expected group order.'));
@@ -302,15 +302,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/modules/system/assets/ajax.js');
+ drupal_add_js('core/modules/system/assets/collapse.js', array('every_page' => TRUE));
+ drupal_add_js('core/modules/system/assets/autocomplete.js');
+ drupal_add_js('core/modules/system/assets/batch.js', array('every_page' => TRUE));
$js_items = drupal_add_js();
$javascript = drupal_get_js();
$expected = implode("\n", array(
- '',
- '',
+ '',
+ '',
));
$this->assertTrue(strpos($javascript, $expected) > 0, t('JavaScript is aggregated in the expected groups and order.'));
}
@@ -324,13 +324,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/modules/system/assets/ajax.js');
+ drupal_add_js('core/modules/system/assets/autocomplete.js');
$js_items = drupal_add_js();
drupal_build_js_cache(array(
- 'core/misc/ajax.js' => $js_items['core/misc/ajax.js'],
- 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js']
+ 'core/modules/system/assets/ajax.js' => $js_items['core/modules/system/assets/ajax.js'],
+ 'core/modules/system/assets/autocomplete.js' => $js_items['core/modules/system/assets/autocomplete.js']
));
// Store the expected key for the first item in the cache.
@@ -341,14 +341,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/modules/system/assets/ajax.js');
+ drupal_add_js('core/modules/system/assets/autocomplete.js');
// Rebuild the cache.
$js_items = drupal_add_js();
drupal_build_js_cache(array(
- 'core/misc/ajax.js' => $js_items['core/misc/ajax.js'],
- 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js']
+ 'core/modules/system/assets/ajax.js' => $js_items['core/modules/system/assets/ajax.js'],
+ 'core/modules/system/assets/autocomplete.js' => $js_items['core/modules/system/assets/autocomplete.js']
));
// Compare the expected key for the first file to the current one.
@@ -406,9 +406,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/modules/system/assets/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21));
$javascript = drupal_get_js();
- $this->assertTrue(strpos($javascript, 'core/misc/collapse.js') < strpos($javascript, 'core/misc/jquery.js'), t('Rendering a JavaScript file above jQuery.'));
+ $this->assertTrue(strpos($javascript, 'core/modules/system/assets/collapse.js') < strpos($javascript, 'core/modules/system/assets/jquery.js'), t('Rendering a JavaScript file above jQuery.'));
}
/**
@@ -418,14 +418,14 @@ class JavaScriptTest extends WebTestBase {
*/
function testAlter() {
// Add both tableselect.js and simpletest.js, with a larger weight on SimpleTest.
- drupal_add_js('core/misc/tableselect.js');
+ drupal_add_js('core/modules/system/assets/tableselect.js');
drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js', array('weight' => 9999));
// Render the JavaScript, testing if simpletest.js was altered to be before
// tableselect.js. See simpletest_js_alter() to see where this alteration
// takes place.
$javascript = drupal_get_js();
- $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/misc/tableselect.js'), t('Altering JavaScript weight through the alter hook.'));
+ $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/modules/system/assets/tableselect.js'), t('Altering JavaScript weight through the alter hook.'));
}
/**
@@ -453,7 +453,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/modules/system/assets/jquery.form.js'), t('Altered library dependencies are added to the page.'));
}
/**
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 3c434ae..0f40e8b 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1218,7 +1218,7 @@ function system_library_info() {
'website' => 'http://api.drupal.org/api/group/ajax/8',
'version' => VERSION,
'js' => array(
- 'core/misc/ajax.js' => array('group' => JS_LIBRARY, 'weight' => 2),
+ 'core/modules/system/assets/ajax.js' => array('group' => JS_LIBRARY, 'weight' => 2),
),
'dependencies' => array(
array('system', 'drupal.progress'),
@@ -1230,7 +1230,7 @@ function system_library_info() {
'title' => 'Drupal batch API',
'version' => VERSION,
'js' => array(
- 'core/misc/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE),
+ 'core/modules/system/assets/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE),
),
'dependencies' => array(
array('system', 'drupal.progress'),
@@ -1242,7 +1242,7 @@ function system_library_info() {
'title' => 'Drupal progress indicator',
'version' => VERSION,
'js' => array(
- 'core/misc/progress.js' => array('group' => JS_DEFAULT),
+ 'core/modules/system/assets/progress.js' => array('group' => JS_DEFAULT),
),
);
@@ -1251,7 +1251,7 @@ function system_library_info() {
'title' => 'Drupal form library',
'version' => VERSION,
'js' => array(
- 'core/misc/form.js' => array('group' => JS_LIBRARY, 'weight' => 1),
+ 'core/modules/system/assets/form.js' => array('group' => JS_LIBRARY, 'weight' => 1),
),
);
@@ -1260,7 +1260,7 @@ function system_library_info() {
'title' => 'Drupal states',
'version' => VERSION,
'js' => array(
- 'core/misc/states.js' => array('group' => JS_LIBRARY, 'weight' => 1),
+ 'core/modules/system/assets/states.js' => array('group' => JS_LIBRARY, 'weight' => 1),
),
);
@@ -1269,7 +1269,7 @@ function system_library_info() {
'title' => 'Drupal tabledrag',
'version' => VERSION,
'js' => array(
- 'core/misc/tabledrag.js' => array('group' => JS_LIBRARY, 'weight' => -1),
+ 'core/modules/system/assets/tabledrag.js' => array('group' => JS_LIBRARY, 'weight' => -1),
),
'dependencies' => array(
array('system', 'jquery.cookie'),
@@ -1281,7 +1281,7 @@ function system_library_info() {
'title' => 'Drupal collapsible fieldset',
'version' => VERSION,
'js' => array(
- 'core/misc/collapse.js' => array('group' => JS_DEFAULT),
+ 'core/modules/system/assets/collapse.js' => array('group' => JS_DEFAULT),
),
'dependencies' => array(
// collapse.js relies on drupalGetSummary in form.js
@@ -1294,7 +1294,7 @@ function system_library_info() {
'title' => 'Drupal autocomplete',
'version' => VERSION,
'js' => array(
- 'core/misc/autocomplete.js' => array('group' => JS_DEFAULT),
+ 'core/modules/system/assets/autocomplete.js' => array('group' => JS_DEFAULT),
),
);
@@ -1304,7 +1304,7 @@ function system_library_info() {
'website' => 'http://jquery.com',
'version' => '1.7.0',
'js' => array(
- 'core/misc/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20),
+ 'core/modules/system/assets/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20),
),
);
@@ -1314,7 +1314,7 @@ function system_library_info() {
'website' => 'http://plugins.jquery.com/project/once',
'version' => '1.2',
'js' => array(
- 'core/misc/jquery.once.js' => array('group' => JS_LIBRARY, 'weight' => -19),
+ 'core/modules/system/assets/jquery.once.js' => array('group' => JS_LIBRARY, 'weight' => -19),
),
);
@@ -1324,7 +1324,7 @@ function system_library_info() {
'website' => 'http://malsup.com/jquery/form/',
'version' => '2.87',
'js' => array(
- 'core/misc/jquery.form.js' => array(),
+ 'core/modules/system/assets/jquery.form.js' => array(),
),
'dependencies' => array(
array('system', 'jquery.cookie'),
@@ -1337,7 +1337,7 @@ function system_library_info() {
'website' => 'http://benalman.com/projects/jquery-bbq-plugin/',
'version' => '1.2.1',
'js' => array(
- 'core/misc/jquery.ba-bbq.js' => array(),
+ 'core/modules/system/assets/jquery.ba-bbq.js' => array(),
),
);
@@ -1347,10 +1347,10 @@ function system_library_info() {
'website' => 'http://drupal.org/node/323112',
'version' => '1.0',
'js' => array(
- 'core/misc/vertical-tabs.js' => array(),
+ 'core/modules/system/assets/vertical-tabs.js' => array(),
),
'css' => array(
- 'core/misc/vertical-tabs.css' => array(),
+ 'core/modules/system/assets/vertical-tabs.css' => array(),
),
'dependencies' => array(
// Vertical tabs relies on drupalGetSummary in form.js
@@ -1377,7 +1377,7 @@ function system_library_info() {
'website' => 'http://code.google.com/p/html5shiv/',
'version' => '11',
'js' => array(
- 'core/misc/html5.js' => array(
+ 'core/modules/system/assets/html5.js' => array(
'group' => JS_LIBRARY,
'weight' => -21,
'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE),
@@ -2272,7 +2272,7 @@ function system_user_timezone(&$form, &$form_state) {
if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) {
$form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Confirm the selection and click save.');
$form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect'));
- drupal_add_js('core/misc/timezone.js');
+ drupal_add_js('core/modules/system/assets/timezone.js');
}
}