diff --git a/core/core.library.yml b/core/core.library.yml new file mode 100644 index 0000000..3ae72a4 --- /dev/null +++ b/core/core.library.yml @@ -0,0 +1,608 @@ +drupal: + version: VERSION + js: + - { file: /misc/drupal.js, group: -100, weight: -18 } + dependencies: + - core/domready + +drupalSettings: + version: VERSION + js: + - { settings: { } } + +drupal.ajax: + version: VERSION + js: + - { file: /misc/ajax.js, group: -100, weight: 2 } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/drupal.progress + - core/jquery.once + +drupal.announce: + version: VERSION + js: + - { file: /misc/announce.js, group: -100 } + dependencies: + - core/drupal + - core/drupal.debounce + +drupal.batch: + version: VERSION + js: + - { file: /misc/batch.js, group: 0, cache: false } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/drupal.ajax + - core/drupal.progress + - core/jquery.once + +drupal.progress: + version: VERSION + js: + - { file: /misc/progress.js, group: 0 } + dependencies: + - core/drupal + - core/jquery + - core/drupalSettings + +drupal.form: + version: VERSION + js: + - { file: /misc/form.js, group: -100, weight: 1 } + dependencies: + - core/jquery + - core/drupal + - core/jquery.cookie + - core/jquery.once + +drupal.dialog: + version: VERSION + js: + - { file: /misc/dialog.js, group: -100 } + - { file: /misc/dialog.position.js, group: -100 } + css: + - { file: /misc/dialog.theme.css, weight: 1 } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/drupal.debounce + - core/drupal.displace + - core/jquery.ui.dialog + +drupal.dialog.ajax: + version: VERSION + js: + - { file: /misc/dialog.ajax.js, group: -100, weight: 3 } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/drupal.ajax + - core/drupal.dialog + +drupal.states: + version: VERSION + js: + - { file: /misc/states.js, group: -100, weight: 1 } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once + +drupal.tabledrag: + version: VERSION + js: + - { file: /misc/tabledrag.js, group: -100, weight: -1 } + dependencies: + - core/jquery + - core/modernizr + - core/drupal + - core/drupalSettings + - core/jquery.once + - core/jquery.cookie + +drupal.tableresponsive: + version: VERSION + js: + - { file: /misc/tableresponsive.js, group: -100 } + dependencies: + - core/jquery + - core/drupal + - core/jquery.once + +drupal.collapse: + version: VERSION + js: + - { file: /misc/collapse.js, group: 0 } + dependencies: + - core/jquery + - core/modernizr + - core/drupal + - core/drupal.form + - core/jquery.once + +drupal.autocomplete: + version: VERSION + js: + - { file: /misc/autocomplete.js, group: 0, weight: -1 } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/drupal.ajax + - core/jquery.ui.autocomplete + +drupal.displace: + version: VERSION + js: + - { file: /misc/displace.js, group: -100 } + dependencies: + - core/jquery + - core/drupal + - core/drupal.debounce + +drupal.tabbingmanager: + version: VERSION + js: + - { file: /misc/tabbingmanager.js, group: -100 } + dependencies: + - core/jquery + - core/jquery.ui.core + - core/drupal + +drupal.debounce: + version: VERSION + js: + - { file: /misc/debounce.js, group: -100 } + dependencies: + - core/drupal + +domready: + version: VERSION + js: + - { file: assets/vendor/domready/ready.min.js, group: -100, weight: -21 } + +jquery: + version: VERSION + js: + - { file: assets/vendor/jquery/jquery.js, group: -100, weight: -20 } + +jquery.once: + version: VERSION + js: + - { file: assets/vendor/jquery-once/jquery.once.js, group: -100, weight: -19 } + dependencies: + - core/jquery + +jquery.form: + version: VERSION + js: + - { file: assets/vendor/jquery-form/jquery.form.js } + dependencies: + - core/jquery + - core/jquery.cookie + +jquery.bbq: + version: VERSION + js: + - { file: assets/vendor/jquery-bbq/jquery.ba-bbq.js } + dependencies: + - core/jquery + +drupal.dropbutton: + version: VERSION + js: + - { file: /misc/dropbutton/dropbutton.js } + css: + - { file: /misc/dropbutton/dropbutton.css } + - { file: /misc/dropbutton/dropbutton.theme.css } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once + +drupal.vertical-tabs: + version: VERSION + js: + - { file: /misc/vertical-tabs.js } + css: + - { file: /misc/vertical-tabs.css } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/drupal.form + +matchmedia: + version: VERSION + js: + - { file: /misc/matchmedia.js } + dependencies: + - core/drupal.debounce + +jquery.farbtastic: + version: VERSION + js: + - { file: assets/vendor/farbtastic/farbtastic.js } + css: + - { file: assets/vendor/farbtastic/farbtastic.css } + dependencies: + - core/jquery + +html5shiv: + version: VERSION + js: + - { file: assets/vendor/html5shiv/html5.js, group: -100, weight: -22, browsers: { IE: 'lte IE 8', '!IE': false } } + +modernizr: + version: VERSION + js: + - { file: assets/vendor/modernizr/modernizr.min.js, every_page: true, group: -100, preprocess: 0, scope: header, weight: -21 } + +normalize: + version: VERSION + css: + - { file: assets/vendor/normalize-css/normalize.css, every_page: true, weight: -220 } + +jquery.ui.core: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.core.js, group: -100, weight: -11 } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.core.css } + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.theme.css } + dependencies: + - core/jquery + +jquery.ui.accordion: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.accordion.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.accordion.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + +jquery.ui.autocomplete: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.autocomplete.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.autocomplete.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + - core/jquery.ui.position + - core/jquery.ui.menu + +jquery.ui.button: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.button.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.button.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + +jquery.ui.datepicker: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.datepicker.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.datepicker.css } + dependencies: + - core/jquery.ui.core + +jquery.ui.dialog: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.dialog.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.dialog.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + - core/jquery.ui.button + - core/jquery.ui.draggable + - core/jquery.ui.mouse + - core/jquery.ui.position + - core/jquery.ui.resizable + +jquery.ui.draggable: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.draggable.js } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.mouse + - core/jquery.ui.widget + +jquery.ui.droppable: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.droppable.js } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + - core/jquery.ui.mouse + - core/jquery.ui.draggable + +jquery.ui.menu: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.menu.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.menu.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + +jquery.ui.mouse: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.mouse.js } + dependencies: + - core/jquery.ui.widget + +jquery.ui.position: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.position.js } + +jquery.ui.progressbar: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.progressbar.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.progressbar.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + +jquery.ui.resizable: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.resizable.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.resizable.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + - core/jquery.ui.mouse + +jquery.ui.selectable: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.selectable.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.selectable.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.mouse + - core/jquery.ui.widget + +jquery.ui.slider: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.slider.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.slider.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.mouse + - core/jquery.ui.widget + +jquery.ui.sortable: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.sortable.js } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.mouse + - core/jquery.ui.widget + +jquery.ui.spinner: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.spinner.js } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + - core/jquery.ui.button + +jquery.ui.tabs: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.tabs.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.tabs.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + +jquery.ui.tooltip: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.tooltip.js } + css: + - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.tooltip.css } + dependencies: + - core/jquery.ui.core + - core/jquery.ui.widget + - core/jquery.ui.position + +jquery.ui.widget: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.ui.widget.js, group: -100, weight: -10 } + dependencies: + - core/jquery.ui.core + +jquery.effects.core: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.core.js, group: -100, weight: -9 } + +jquery.effects.blind: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.blind.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.bounce: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.bounce.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.clip: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.clip.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.drop: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.drop.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.explode: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.explode.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.fade: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.fade.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.fold: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.fold.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.highlight: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.highlight.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.pulsate: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.pulsate.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.scale: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.scale.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.shake: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.shake.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.slide: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.slide.js } + dependencies: + - core/jquery.effects.core + +jquery.effects.transfer: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/ui/jquery.effects.transfer.js } + dependencies: + - core/jquery.effects.core + +jquery.ui.touch-punch: + version: VERSION + js: + - { file: assets/vendor/jquery-ui-touch-punch/jquery.ui.touch-punch.js } + dependencies: + - core/jquery.ui.core + +underscore: + version: VERSION + js: + - { file: assets/vendor/underscore/underscore.js, group: -100, weight: -20 } + +backbone: + version: VERSION + js: + - { file: assets/vendor/backbone/backbone.js, group: -100, weight: -19 } + dependencies: + - core/underscore + +jquery.cookie: + version: VERSION + js: + - { file: assets/vendor/jquery.ui/external/jquery.cookie.js } + dependencies: + - core/jquery + +drupal.tableselect: + version: VERSION + js: + - { file: /misc/tableselect.js } + dependencies: + - core/drupal + - core/jquery + +drupal.tableheader: + version: VERSION + js: + - { file: /misc/tableheader.js } + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once + - core/drupal.displace + +drupal.timezone: + version: VERSION + js: + - { file: /misc/timezone.js } + dependencies: + - core/jquery + - core/drupal + +drupal.machine-name: + version: VERSION + js: + - { file: /misc/machine-name.js } + dependencies: + - core/jquery + - core/jquery.once + - core/drupal + - core/drupalSettings diff --git a/core/includes/common.inc b/core/includes/common.inc index 6491c09..fd274b8 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -2760,11 +2760,19 @@ function drupal_add_library($module, $name, $every_page = NULL) { function drupal_get_library($module, $name = NULL) { $libraries = &drupal_static(__FUNCTION__, array()); - $module_path = drupal_get_path('module', $module); - if (in_array($module, array('seven', 'bartik'))) { - $module_path = drupal_get_path('theme', $module); + if ($module === 'core') { + $module_path = 'core'; + $library_info = 'core/core.library.yml'; + } + else { + // @todo Add a $type argument OR automatically figure out the type based on + // current extension data, possibly using a module->theme fallback mechanism. + $module_path = drupal_get_path('module', $module); + if (in_array($module, array('seven', 'bartik'))) { + $module_path = drupal_get_path('theme', $module); + } + $library_info = $module_path . '/' . $module . '.library.yml'; } - $library_info = $module_path . '/' . $module . '.library.yml'; if (!isset($libraries[$module]) && file_exists($library_info)) { $parser = new Parser(); @@ -2772,6 +2780,7 @@ function drupal_get_library($module, $name = NULL) { if (empty($module_libraries)) { $module_libraries = array(); } + // Allow modules to alter the module's registered libraries. drupal_alter('library_info', $module_libraries, $module); foreach ($module_libraries as $lib_name => $library) { @@ -2786,21 +2795,16 @@ function drupal_get_library($module, $name = NULL) { $file['version'] = $new_library['version']; if (!empty($file['file'])) { - $file['data'] = $module_path . '/' . $file['file']; + // An absolute path maps to the Drupal document root. + if ($file['file'][0] === '/') { + $file['data'] = substr($file['file'], 1); + } + else { + $file['data'] = $module_path . '/' . $file['file']; + } $file['type'] = 'file'; unset($file['file']); } - // @todo fix #1473066 or #1663622 to get rid of this. - elseif (!empty($file['misc'])) { - $file['data'] = 'core/misc/' . $file['misc']; - $file['type'] = 'file'; - unset($file['misc']); - } - elseif (!empty($file['asset'])) { - $file['data'] = 'core/assets/vendor/' . $file['asset']; - $file['type'] = 'file'; - unset($file['asset']); - } elseif (!empty($file['external'])) { $file['data'] = $file['external']; $file['type'] = 'external'; diff --git a/core/modules/block/block.library.yml b/core/modules/block/block.library.yml index 796e351..98ac0d9 100644 --- a/core/modules/block/block.library.yml +++ b/core/modules/block/block.library.yml @@ -3,8 +3,8 @@ drupal.block: js: - { file: block.js } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal drupal.block.admin: version: VERSION js: @@ -12,5 +12,5 @@ drupal.block.admin: css: - { file: css/block.admin.css } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal diff --git a/core/modules/book/book.library.yml b/core/modules/book/book.library.yml index 1bd4b2d..20365b7 100644 --- a/core/modules/book/book.library.yml +++ b/core/modules/book/book.library.yml @@ -3,6 +3,6 @@ drupal.book: js: - { file: book.js } dependencies: - - system/jquery - - system/drupal - - system/drupal.form + - core/jquery + - core/drupal + - core/drupal.form diff --git a/core/modules/ckeditor/ckeditor.library.yml b/core/modules/ckeditor/ckeditor.library.yml index a6be285..674a201 100644 --- a/core/modules/ckeditor/ckeditor.library.yml +++ b/core/modules/ckeditor/ckeditor.library.yml @@ -6,9 +6,9 @@ drupal.ckeditor: css: - { file: css/ckeditor.css } dependencies: - - system/jquery - - system/drupal - - system/drupal.debounce + - core/jquery + - core/drupal + - core/drupal.debounce - ckeditor/ckeditor - editor/drupal.editor drupal.ckeditor.admin: @@ -19,39 +19,39 @@ drupal.ckeditor.admin: - { file: css/ckeditor.admin.css } - { asset: ckeditor/skins/moono/editor.css } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings - - system/jquery.once - - system/jquery.ui.sortable - - system/jquery.ui.draggable - - system/jquery.ui.touch-punch - - system/backbone - - system/drupal.dialog - - system/drupal.announce + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once + - core/jquery.ui.sortable + - core/jquery.ui.draggable + - core/jquery.ui.touch-punch + - core/backbone + - core/drupal.dialog + - core/drupal.announce - ckeditor/ckeditor - editor/drupal.editor.admin - - system/drupal.vertical-tabs + - core/drupal.vertical-tabs drupal.ckeditor.drupalimage.admin: version: VERSION js: - { file: js/ckeditor.drupalimage.admin.js } dependencies: - - system/jquery - - system/drupal - - system/jquery.once - - system/drupal.vertical-tabs - - system/drupalSettings + - core/jquery + - core/drupal + - core/jquery.once + - core/drupal.vertical-tabs + - core/drupalSettings drupal.ckeditor.stylescombo.admin: version: VERSION js: - { file: js/ckeditor.stylescombo.admin.js } dependencies: - - system/jquery - - system/drupal - - system/jquery.once - - system/drupal.vertical-tabs - - system/drupalSettings + - core/jquery + - core/drupal + - core/jquery.once + - core/drupal.vertical-tabs + - core/drupalSettings drupal.ckeditor.drupalimagecaption-theme: version: VERSION js: diff --git a/core/modules/color/color.library.yml b/core/modules/color/color.library.yml index bbaf686..22b02c6 100644 --- a/core/modules/color/color.library.yml +++ b/core/modules/color/color.library.yml @@ -3,17 +3,17 @@ drupal.color: js: - { file: color.js } dependencies: - - system/jquery - - system/drupal - - system/jquery.once - - system/jquery.farbtastic + - core/jquery + - core/drupal + - core/jquery.once + - core/jquery.farbtastic - color/drupal.color.preview drupal.color.preview: version: VERSION js: - { file: preview.js } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings - - system/jquery.once + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once diff --git a/core/modules/comment/comment.library.yml b/core/modules/comment/comment.library.yml index ea3d01d..5629b4b 100644 --- a/core/modules/comment/comment.library.yml +++ b/core/modules/comment/comment.library.yml @@ -3,31 +3,31 @@ drupal.comment: js: - { file: comment-entity-form.js } dependencies: - - system/jquery - - system/drupal - - system/drupal.form + - core/jquery + - core/drupal + - core/drupal.form drupal.comment-by-viewer: version: VERSION js: - { file: js/comment-by-viewer.js } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings + - core/jquery + - core/drupal + - core/drupalSettings drupal.comment-new-indicator: version: VERSION js: - { file: js/comment-new-indicator.js } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal - history/drupal.history - - system/drupal.displace + - core/drupal.displace drupal.node-new-comments-link: version: VERSION js: - { file: js/node-new-comments-link.js } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal - history/drupal.history diff --git a/core/modules/content_translation/content_translation.library.yml b/core/modules/content_translation/content_translation.library.yml index 5e59d3e..deae9a5 100644 --- a/core/modules/content_translation/content_translation.library.yml +++ b/core/modules/content_translation/content_translation.library.yml @@ -5,6 +5,6 @@ drupal.content_translation.admin: css: - { file: css/content_translation.admin.css } dependencies: - - system/jquery - - system/drupal - - system/jquery.once + - core/jquery + - core/drupal + - core/jquery.once diff --git a/core/modules/contextual/contextual.library.yml b/core/modules/contextual/contextual.library.yml index d8c2d0e..3bf6e15 100644 --- a/core/modules/contextual/contextual.library.yml +++ b/core/modules/contextual/contextual.library.yml @@ -7,12 +7,12 @@ drupal.contextual-links: - { file: css/contextual.theme.css } - { file: css/contextual.icons.css } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings - - system/backbone - - system/modernizr - - system/jquery.once + - core/jquery + - core/drupal + - core/drupalSettings + - core/backbone + - core/modernizr + - core/jquery.once drupal.contextual-toolbar: version: VERSION js: @@ -20,9 +20,9 @@ drupal.contextual-toolbar: css: - { file: css/contextual.toolbar.css } dependencies: - - system/jquery - - system/drupal - - system/backbone - - system/jquery.once - - system/drupal.tabbingmanager - - system/drupal.announce + - core/jquery + - core/drupal + - core/backbone + - core/jquery.once + - core/drupal.tabbingmanager + - core/drupal.announce diff --git a/core/modules/edit/edit.library.yml b/core/modules/edit/edit.library.yml index f7c0fc8..98a9f4c 100644 --- a/core/modules/edit/edit.library.yml +++ b/core/modules/edit/edit.library.yml @@ -20,18 +20,18 @@ edit: - { file: css/edit.theme.css } - { file: css/edit.icons.css } dependencies: - - system/jquery - - system/underscore - - system/backbone - - system/jquery.form - - system/jquery.ui.position - - system/drupal - - system/drupal.displace - - system/drupal.form - - system/drupal.ajax - - system/drupal.debounce - - system/drupalSettings - - system/drupal.dialog + - core/jquery + - core/underscore + - core/backbone + - core/jquery.form + - core/jquery.ui.position + - core/drupal + - core/drupal.displace + - core/drupal.form + - core/drupal.ajax + - core/drupal.debounce + - core/drupalSettings + - core/drupal.dialog edit.inPlaceEditor.form: version: VERSION js: diff --git a/core/modules/editor/editor.library.yml b/core/modules/editor/editor.library.yml index 443e83a..aca72d0 100644 --- a/core/modules/editor/editor.library.yml +++ b/core/modules/editor/editor.library.yml @@ -3,8 +3,8 @@ drupal.editor.admin: js: - { file: js/editor.admin.js } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal drupal.editor: version: VERSION js: @@ -12,19 +12,19 @@ drupal.editor: css: - { file: css/editor.css } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings - - system/jquery.once + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once drupal.editor.dialog: version: VERSION js: - { file: js/editor.dialog.js, weight: 2 } dependencies: - - system/jquery - - system/drupal.dialog - - system/drupal.ajax - - system/drupalSettings + - core/jquery + - core/drupal.dialog + - core/drupal.ajax + - core/drupalSettings edit.inPlaceEditor.formattedText: version: VERSION js: @@ -33,5 +33,5 @@ edit.inPlaceEditor.formattedText: dependencies: - edit/edit - editor/drupal.editor - - system/drupal.ajax - - system/drupalSettings + - core/drupal.ajax + - core/drupalSettings diff --git a/core/modules/field_ui/field_ui.library.yml b/core/modules/field_ui/field_ui.library.yml index 6b2eba7..b279bdb 100644 --- a/core/modules/field_ui/field_ui.library.yml +++ b/core/modules/field_ui/field_ui.library.yml @@ -5,7 +5,7 @@ drupal.field_ui: css: - { file: css/field_ui.admin.css } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings - - system/jquery.once + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once diff --git a/core/modules/file/file.library.yml b/core/modules/file/file.library.yml index f92d365..42fdfc7 100644 --- a/core/modules/file/file.library.yml +++ b/core/modules/file/file.library.yml @@ -5,6 +5,6 @@ drupal.file: css: - { file: css/file.admin.css } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings + - core/jquery + - core/drupal + - core/drupalSettings diff --git a/core/modules/filter/filter.library.yml b/core/modules/filter/filter.library.yml index 28b2b5a..6fb4cf4 100644 --- a/core/modules/filter/filter.library.yml +++ b/core/modules/filter/filter.library.yml @@ -5,18 +5,18 @@ drupal.filter.admin: css: - { file: css/filter.admin.css } dependencies: - - system/jquery - - system/drupal - - system/jquery.once - - system/drupal.form + - core/jquery + - core/drupal + - core/jquery.once + - core/drupal.form drupal.filter.filter_html.admin: version: VERSION js: - { file: filter.filter_html.admin.js } dependencies: - - system/jquery - - system/jquery.once - - system/underscore + - core/jquery + - core/jquery.once + - core/underscore drupal.filter: version: VERSION js: @@ -24,9 +24,9 @@ drupal.filter: css: - { file: css/filter.admin.css } dependencies: - - system/jquery - - system/drupal - - system/jquery.once + - core/jquery + - core/drupal + - core/jquery.once caption: version: VERSION css: diff --git a/core/modules/history/history.library.yml b/core/modules/history/history.library.yml index 53c7e73..8154bf7 100644 --- a/core/modules/history/history.library.yml +++ b/core/modules/history/history.library.yml @@ -3,7 +3,7 @@ drupal.history: js: - { file: js/history.js } dependencies: - - system/jquery - - system/drupalSettings - - system/drupal - - system/drupal.ajax + - core/jquery + - core/drupalSettings + - core/drupal + - core/drupal.ajax diff --git a/core/modules/language/language.library.yml b/core/modules/language/language.library.yml index a598371..4e46d3c 100644 --- a/core/modules/language/language.library.yml +++ b/core/modules/language/language.library.yml @@ -3,6 +3,6 @@ language.admin: js: - { file: language.admin.js } dependencies: - - system/jquery - - system/drupal - - system/jquery.once + - core/jquery + - core/drupal + - core/jquery.once diff --git a/core/modules/locale/locale.library.yml b/core/modules/locale/locale.library.yml index d8bff21..106ffcc 100644 --- a/core/modules/locale/locale.library.yml +++ b/core/modules/locale/locale.library.yml @@ -3,14 +3,14 @@ drupal.locale.admin: js: - { file: locale.admin.js } dependencies: - - system/jquery - - system/drupal - - system/jquery.once + - core/jquery + - core/drupal + - core/jquery.once drupal.locale.datepicker: version: VERSION js: - { file: locale.datepicker.js } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings + - core/jquery + - core/drupal + - core/drupalSettings diff --git a/core/modules/menu/menu.library.yml b/core/modules/menu/menu.library.yml index 349aa0a..32dc303 100644 --- a/core/modules/menu/menu.library.yml +++ b/core/modules/menu/menu.library.yml @@ -3,13 +3,13 @@ drupal.menu: js: - { file: menu.js } dependencies: - - system/jquery - - system/drupal - - system/drupal.form + - core/jquery + - core/drupal + - core/drupal.form drupal.menu.admin: version: VERSION js: - { file: menu.admin.js } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal diff --git a/core/modules/node/node.library.yml b/core/modules/node/node.library.yml index 9087106..e0fd4e9 100644 --- a/core/modules/node/node.library.yml +++ b/core/modules/node/node.library.yml @@ -3,22 +3,22 @@ drupal.node: js: - { file: node.js } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings - - system/drupal.form + - core/jquery + - core/drupal + - core/drupalSettings + - core/drupal.form drupal.node.preview: version: VERSION js: - { file: node.preview.js } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal drupal.content_types: version: VERSION js: - { file: content_types.js } dependencies: - - system/jquery - - system/drupal - - system/drupal.form + - core/jquery + - core/drupal + - core/drupal.form diff --git a/core/modules/path/path.library.yml b/core/modules/path/path.library.yml index 39f9069..c42039d 100644 --- a/core/modules/path/path.library.yml +++ b/core/modules/path/path.library.yml @@ -3,6 +3,6 @@ drupal.path: js: - { file: path.js } dependencies: - - system/jquery - - system/drupal - - system/drupal.form + - core/jquery + - core/drupal + - core/drupal.form diff --git a/core/modules/picture/picture.library.yml b/core/modules/picture/picture.library.yml index b0ea7fc..eba44f5 100644 --- a/core/modules/picture/picture.library.yml +++ b/core/modules/picture/picture.library.yml @@ -3,4 +3,4 @@ picturefill: js: - { file: picturefill/picturefill.js, type: file, weight: -10, group: 0 } dependencies: - - system/matchmedia + - core/matchmedia diff --git a/core/modules/shortcut/shortcut.library.yml b/core/modules/shortcut/shortcut.library.yml index 012fc30..087784d 100644 --- a/core/modules/shortcut/shortcut.library.yml +++ b/core/modules/shortcut/shortcut.library.yml @@ -3,8 +3,8 @@ drupal.shortcut.admin: js: - { file: shortcut.admin.js } dependencies: - - system/jquery - - system/drupal + - core/jquery + - core/drupal drupal.shortcut: version: VERSION css: diff --git a/core/modules/simpletest/simpletest.library.yml b/core/modules/simpletest/simpletest.library.yml index e8226e2..b934485 100644 --- a/core/modules/simpletest/simpletest.library.yml +++ b/core/modules/simpletest/simpletest.library.yml @@ -5,9 +5,9 @@ drupal.simpletest: css: - { file: css/simpletest.module.css } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings - - system/jquery.once - - system/drupal.tableselect - - system/drupal.debounce + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once + - core/drupal.tableselect + - core/drupal.debounce diff --git a/core/modules/statistics/statistics.library.yml b/core/modules/statistics/statistics.library.yml index c2dc3f86..b241fdb 100644 --- a/core/modules/statistics/statistics.library.yml +++ b/core/modules/statistics/statistics.library.yml @@ -3,6 +3,6 @@ drupal.statistics: js: - { file: statistics.js, scope: footer } dependencies: - - system/jquery - - system/drupal - - system/drupalSettings + - core/jquery + - core/drupal + - core/drupalSettings diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/NoJavaScriptAnonymousTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/NoJavaScriptAnonymousTest.php index 4d1d417..a13e38a 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/NoJavaScriptAnonymousTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/NoJavaScriptAnonymousTest.php @@ -63,19 +63,13 @@ public function testNoJavaScript() { protected function assertNoJavaScriptExceptHtml5Shiv() { // Ensure drupalSettings is not set. $this->assertNoRaw('var drupalSettings = {', 'drupalSettings is not set.'); -/* + // Ensure the HTML5 shiv exists. - $system_libraries = system_library_info(); - $html5_shiv_version = $system_libraries['html5shiv']['version']; - $html5_shiv_markup = 'core/assets/vendor/html5shiv/html5.js?v=' . $html5_shiv_version . '">'; - $this->assertRaw($html5_shiv_markup, 'HTML5 shiv JavaScript exists.'); + $this->assertRaw('html5shiv/html5.js', 'HTML5 shiv JavaScript exists.'); // Ensure no other JavaScript file exists on the page, while ignoring the // HTML5 shiv. - $content = $this->drupalGetContent(); - $this->drupalSetContent(str_replace($html5_shiv_markup, '', $content)); - $this->assertNoRaw('.js', "No other JavaScript exists."); -*/ + $this->assertNoPattern('/(?