diff --git a/core/core.library.yml b/core/core.library.yml index 3ae72a4..74ee00aa 100644 --- a/core/core.library.yml +++ b/core/core.library.yml @@ -1,7 +1,12 @@ +ckeditor: + version: VERSION + js: + - { file: assets/vendor/ckeditor/ckeditor.js, preprocess: false } + drupal: version: VERSION js: - - { file: /misc/drupal.js, group: -100, weight: -18 } + - { file: misc/drupal.js, group: -100, weight: -18 } dependencies: - core/domready @@ -13,7 +18,7 @@ drupalSettings: drupal.ajax: version: VERSION js: - - { file: /misc/ajax.js, group: -100, weight: 2 } + - { file: misc/ajax.js, group: -100, weight: 2 } dependencies: - core/jquery - core/drupal @@ -24,7 +29,7 @@ drupal.ajax: drupal.announce: version: VERSION js: - - { file: /misc/announce.js, group: -100 } + - { file: misc/announce.js, group: -100 } dependencies: - core/drupal - core/drupal.debounce @@ -32,7 +37,7 @@ drupal.announce: drupal.batch: version: VERSION js: - - { file: /misc/batch.js, group: 0, cache: false } + - { file: misc/batch.js, group: 0, cache: false } dependencies: - core/jquery - core/drupal @@ -44,7 +49,7 @@ drupal.batch: drupal.progress: version: VERSION js: - - { file: /misc/progress.js, group: 0 } + - { file: misc/progress.js, group: 0 } dependencies: - core/drupal - core/jquery @@ -53,7 +58,7 @@ drupal.progress: drupal.form: version: VERSION js: - - { file: /misc/form.js, group: -100, weight: 1 } + - { file: misc/form.js, group: -100, weight: 1 } dependencies: - core/jquery - core/drupal @@ -63,10 +68,10 @@ drupal.form: drupal.dialog: version: VERSION js: - - { file: /misc/dialog.js, group: -100 } - - { file: /misc/dialog.position.js, group: -100 } + - { file: misc/dialog.js, group: -100 } + - { file: misc/dialog.position.js, group: -100 } css: - - { file: /misc/dialog.theme.css, weight: 1 } + - { file: misc/dialog.theme.css, weight: 1 } dependencies: - core/jquery - core/drupal @@ -78,7 +83,7 @@ drupal.dialog: drupal.dialog.ajax: version: VERSION js: - - { file: /misc/dialog.ajax.js, group: -100, weight: 3 } + - { file: misc/dialog.ajax.js, group: -100, weight: 3 } dependencies: - core/jquery - core/drupal @@ -89,7 +94,7 @@ drupal.dialog.ajax: drupal.states: version: VERSION js: - - { file: /misc/states.js, group: -100, weight: 1 } + - { file: misc/states.js, group: -100, weight: 1 } dependencies: - core/jquery - core/drupal @@ -99,7 +104,7 @@ drupal.states: drupal.tabledrag: version: VERSION js: - - { file: /misc/tabledrag.js, group: -100, weight: -1 } + - { file: misc/tabledrag.js, group: -100, weight: -1 } dependencies: - core/jquery - core/modernizr @@ -111,7 +116,7 @@ drupal.tabledrag: drupal.tableresponsive: version: VERSION js: - - { file: /misc/tableresponsive.js, group: -100 } + - { file: misc/tableresponsive.js, group: -100 } dependencies: - core/jquery - core/drupal @@ -120,7 +125,7 @@ drupal.tableresponsive: drupal.collapse: version: VERSION js: - - { file: /misc/collapse.js, group: 0 } + - { file: misc/collapse.js, group: 0 } dependencies: - core/jquery - core/modernizr @@ -131,7 +136,7 @@ drupal.collapse: drupal.autocomplete: version: VERSION js: - - { file: /misc/autocomplete.js, group: 0, weight: -1 } + - { file: misc/autocomplete.js, group: 0, weight: -1 } dependencies: - core/jquery - core/drupal @@ -142,7 +147,7 @@ drupal.autocomplete: drupal.displace: version: VERSION js: - - { file: /misc/displace.js, group: -100 } + - { file: misc/displace.js, group: -100 } dependencies: - core/jquery - core/drupal @@ -151,7 +156,7 @@ drupal.displace: drupal.tabbingmanager: version: VERSION js: - - { file: /misc/tabbingmanager.js, group: -100 } + - { file: misc/tabbingmanager.js, group: -100 } dependencies: - core/jquery - core/jquery.ui.core @@ -160,7 +165,7 @@ drupal.tabbingmanager: drupal.debounce: version: VERSION js: - - { file: /misc/debounce.js, group: -100 } + - { file: misc/debounce.js, group: -100 } dependencies: - core/drupal @@ -199,10 +204,10 @@ jquery.bbq: drupal.dropbutton: version: VERSION js: - - { file: /misc/dropbutton/dropbutton.js } + - { file: misc/dropbutton/dropbutton.js } css: - - { file: /misc/dropbutton/dropbutton.css } - - { file: /misc/dropbutton/dropbutton.theme.css } + - { file: misc/dropbutton/dropbutton.css } + - { file: misc/dropbutton/dropbutton.theme.css } dependencies: - core/jquery - core/drupal @@ -212,9 +217,9 @@ drupal.dropbutton: drupal.vertical-tabs: version: VERSION js: - - { file: /misc/vertical-tabs.js } + - { file: misc/vertical-tabs.js } css: - - { file: /misc/vertical-tabs.css } + - { file: misc/vertical-tabs.css } dependencies: - core/jquery - core/drupal @@ -224,7 +229,7 @@ drupal.vertical-tabs: matchmedia: version: VERSION js: - - { file: /misc/matchmedia.js } + - { file: misc/matchmedia.js } dependencies: - core/drupal.debounce @@ -573,7 +578,7 @@ jquery.cookie: drupal.tableselect: version: VERSION js: - - { file: /misc/tableselect.js } + - { file: misc/tableselect.js } dependencies: - core/drupal - core/jquery @@ -581,7 +586,7 @@ drupal.tableselect: drupal.tableheader: version: VERSION js: - - { file: /misc/tableheader.js } + - { file: misc/tableheader.js } dependencies: - core/jquery - core/drupal @@ -592,7 +597,7 @@ drupal.tableheader: drupal.timezone: version: VERSION js: - - { file: /misc/timezone.js } + - { file: misc/timezone.js } dependencies: - core/jquery - core/drupal @@ -600,7 +605,7 @@ drupal.timezone: drupal.machine-name: version: VERSION js: - - { file: /misc/machine-name.js } + - { file: misc/machine-name.js } dependencies: - core/jquery - core/jquery.once diff --git a/core/includes/common.inc b/core/includes/common.inc index e6f7f65..fd274b8 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -2765,6 +2765,8 @@ function drupal_get_library($module, $name = NULL) { $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); diff --git a/core/modules/ckeditor/ckeditor.library.yml b/core/modules/ckeditor/ckeditor.library.yml index 674a201..e747149 100644 --- a/core/modules/ckeditor/ckeditor.library.yml +++ b/core/modules/ckeditor/ckeditor.library.yml @@ -9,7 +9,7 @@ drupal.ckeditor: - core/jquery - core/drupal - core/drupal.debounce - - ckeditor/ckeditor + - core/ckeditor - editor/drupal.editor drupal.ckeditor.admin: version: VERSION @@ -17,7 +17,7 @@ drupal.ckeditor.admin: - { file: js/ckeditor.admin.js } css: - { file: css/ckeditor.admin.css } - - { asset: ckeditor/skins/moono/editor.css } + - { file: /core/assets/vendor/ckeditor/skins/moono/editor.css } dependencies: - core/jquery - core/drupal @@ -29,7 +29,7 @@ drupal.ckeditor.admin: - core/backbone - core/drupal.dialog - core/drupal.announce - - ckeditor/ckeditor + - core/ckeditor - editor/drupal.editor.admin - core/drupal.vertical-tabs drupal.ckeditor.drupalimage.admin: @@ -57,8 +57,4 @@ drupal.ckeditor.drupalimagecaption-theme: js: - { file: js/plugins/drupalimagecaption/theme.js } dependencies: - - ckeditor/ckeditor -ckeditor: - version: VERSION - js: - - { asset: ckeditor/ckeditor.js, preprocess: false } + - core/ckeditor