Commit 94c7316a authored by webchick's avatar webchick

Revert "Issue #1945262 by nod_: Replace custom weights with dependencies in library declarations"

Broke testing UI. Reverted.

This reverts commit dc5ef576.
parent d5304a46
...@@ -8,7 +8,7 @@ backbone: ...@@ -8,7 +8,7 @@ backbone:
url: https://github.com/jashkenas/backbone/blob/1.1.2/LICENSE url: https://github.com/jashkenas/backbone/blob/1.1.2/LICENSE
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/backbone/backbone-min.js: { minified: true } assets/vendor/backbone/backbone-min.js: { weight: -19, minified: true }
dependencies: dependencies:
- core/underscore - core/underscore
...@@ -20,7 +20,7 @@ classList: ...@@ -20,7 +20,7 @@ classList:
url: https://github.com/eligrey/classList.js/blob/2014-12-13/LICENSE.md url: https://github.com/eligrey/classList.js/blob/2014-12-13/LICENSE.md
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/classList/classList.min.js: { browsers: { IE: 'lte IE 9', '!IE': false }, minified: true } assets/vendor/classList/classList.min.js: { weight: -21, browsers: { IE: 'lte IE 9', '!IE': false }, minified: true }
ckeditor: ckeditor:
remote: https://github.com/ckeditor/ckeditor-dev remote: https://github.com/ckeditor/ckeditor-dev
...@@ -40,12 +40,12 @@ domready: ...@@ -40,12 +40,12 @@ domready:
url: https://github.com/ded/domready/blob/v1.0.7/LICENSE url: https://github.com/ded/domready/blob/v1.0.7/LICENSE
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/domready/ready.min.js: { minified: true } assets/vendor/domready/ready.min.js: { weight: -21, minified: true }
drupal: drupal:
version: VERSION version: VERSION
js: js:
misc/drupal.js: {} misc/drupal.js: { weight: -18 }
dependencies: dependencies:
- core/domready - core/domready
- core/drupalSettings - core/drupalSettings
...@@ -102,7 +102,7 @@ drupal.announce: ...@@ -102,7 +102,7 @@ drupal.announce:
drupal.autocomplete: drupal.autocomplete:
version: VERSION version: VERSION
js: js:
misc/autocomplete.js: {} misc/autocomplete.js: { weight: -1 }
dependencies: dependencies:
- core/jquery - core/jquery
- core/drupal - core/drupal
...@@ -246,7 +246,7 @@ drupal.tabbingmanager: ...@@ -246,7 +246,7 @@ drupal.tabbingmanager:
drupal.tabledrag: drupal.tabledrag:
version: VERSION version: VERSION
js: js:
misc/tabledrag.js: {} misc/tabledrag.js: { weight: -1 }
dependencies: dependencies:
- core/jquery - core/jquery
- core/modernizr - core/modernizr
...@@ -297,7 +297,7 @@ drupal.vertical-tabs: ...@@ -297,7 +297,7 @@ drupal.vertical-tabs:
version: VERSION version: VERSION
js: js:
# Load before core/drupal.collapse. # Load before core/drupal.collapse.
misc/vertical-tabs.js: {} misc/vertical-tabs.js: { weight: -1 }
css: css:
component: component:
misc/vertical-tabs.css: {} misc/vertical-tabs.css: {}
...@@ -318,7 +318,7 @@ html5shiv: ...@@ -318,7 +318,7 @@ html5shiv:
url: http://www.gnu.org/licenses/gpl-2.0.html url: http://www.gnu.org/licenses/gpl-2.0.html
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/html5shiv/html5shiv.min.js: { every_page: true, browsers: { IE: 'lte IE 8', '!IE': false }, minified: true } assets/vendor/html5shiv/html5shiv.min.js: { every_page: true, weight: -22, browsers: { IE: 'lte IE 8', '!IE': false }, minified: true }
jquery: jquery:
remote: https://github.com/jquery/jquery remote: https://github.com/jquery/jquery
...@@ -328,7 +328,7 @@ jquery: ...@@ -328,7 +328,7 @@ jquery:
url: https://github.com/jquery/jquery/blob/2.1.3/MIT-LICENSE.txt url: https://github.com/jquery/jquery/blob/2.1.3/MIT-LICENSE.txt
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/jquery/jquery.min.js: { minified: true } assets/vendor/jquery/jquery.min.js: { minified: true, weight: -20 }
jquery.cookie: jquery.cookie:
remote: https://github.com/carhartl/jquery-cookie remote: https://github.com/carhartl/jquery-cookie
...@@ -398,7 +398,7 @@ jquery.once: ...@@ -398,7 +398,7 @@ jquery.once:
url: https://github.com/RobLoach/jquery-once/blob/1.2.3/LICENSE url: https://github.com/RobLoach/jquery-once/blob/1.2.3/LICENSE
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/jquery-once/jquery.once.js: {} assets/vendor/jquery-once/jquery.once.js: { weight: -19 }
dependencies: dependencies:
- core/jquery - core/jquery
...@@ -410,7 +410,7 @@ jquery.ui: ...@@ -410,7 +410,7 @@ jquery.ui:
url: https://github.com/jquery/jquery-ui/blob/1.11.2/MIT-LICENSE.txt url: https://github.com/jquery/jquery-ui/blob/1.11.2/MIT-LICENSE.txt
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/jquery.ui/ui/core-min.js: { minified: true } assets/vendor/jquery.ui/ui/core-min.js: { weight: -11, minified: true }
css: css:
component: component:
assets/vendor/jquery.ui/themes/base/core.css: {} assets/vendor/jquery.ui/themes/base/core.css: {}
...@@ -510,7 +510,7 @@ jquery.ui.effects.core: ...@@ -510,7 +510,7 @@ jquery.ui.effects.core:
version: *jquery_ui_version version: *jquery_ui_version
license: *jquery_ui_license license: *jquery_ui_license
js: js:
assets/vendor/jquery.ui/ui/effect-min.js: { minified: true } assets/vendor/jquery.ui/ui/effect-min.js: { weight: -9, minified: true }
jquery.ui.effects.blind: jquery.ui.effects.blind:
version: *jquery_ui_version version: *jquery_ui_version
...@@ -787,7 +787,7 @@ jquery.ui.widget: ...@@ -787,7 +787,7 @@ jquery.ui.widget:
version: *jquery_ui_version version: *jquery_ui_version
license: *jquery_ui_license license: *jquery_ui_license
js: js:
assets/vendor/jquery.ui/ui/widget-min.js: { minified: true } assets/vendor/jquery.ui/ui/widget-min.js: { weight: -10, minified: true }
dependencies: dependencies:
- core/jquery.ui - core/jquery.ui
...@@ -819,7 +819,7 @@ modernizr: ...@@ -819,7 +819,7 @@ modernizr:
gpl-compatible: true gpl-compatible: true
version: v2.8.3 version: v2.8.3
js: js:
assets/vendor/modernizr/modernizr.min.js: { every_page: true, preprocess: 0 } assets/vendor/modernizr/modernizr.min.js: { every_page: true, preprocess: 0, weight: -21, minified: true }
normalize: normalize:
remote: https://github.com/necolas/normalize.css remote: https://github.com/necolas/normalize.css
...@@ -830,7 +830,7 @@ normalize: ...@@ -830,7 +830,7 @@ normalize:
gpl-compatible: true gpl-compatible: true
css: css:
base: base:
assets/vendor/normalize-css/normalize.css: { every_page: true } assets/vendor/normalize-css/normalize.css: { every_page: true, weight: -20 }
picturefill: picturefill:
remote: https://github.com/scottjehl/picturefill remote: https://github.com/scottjehl/picturefill
...@@ -842,7 +842,7 @@ picturefill: ...@@ -842,7 +842,7 @@ picturefill:
url: https://github.com/scottjehl/picturefill/blob/master/LICENSE url: https://github.com/scottjehl/picturefill/blob/master/LICENSE
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/picturefill/picturefill.js: {} assets/vendor/picturefill/picturefill.js: { weight: -10 }
dependencies: dependencies:
- core/matchmedia - core/matchmedia
...@@ -854,4 +854,4 @@ underscore: ...@@ -854,4 +854,4 @@ underscore:
url: https://github.com/jashkenas/underscore/blob/1.7.0/LICENSE url: https://github.com/jashkenas/underscore/blob/1.7.0/LICENSE
gpl-compatible: true gpl-compatible: true
js: js:
assets/vendor/underscore/underscore-min.js: { minified: true } assets/vendor/underscore/underscore-min.js: { weight: -20, minified: true }
...@@ -3,14 +3,14 @@ drupal.contextual-links: ...@@ -3,14 +3,14 @@ drupal.contextual-links:
js: js:
# Ensure to run before contextual/drupal.context-toolbar. # Ensure to run before contextual/drupal.context-toolbar.
# Core. # Core.
js/contextual.js: {} js/contextual.js: { weight: -2 }
# Models. # Models.
js/models/StateModel.js: {} js/models/StateModel.js: { weight: -2 }
# Views. # Views.
js/views/AuralView.js: {} js/views/AuralView.js: { weight: -2 }
js/views/KeyboardView.js: {} js/views/KeyboardView.js: { weight: -2 }
js/views/RegionView.js: {} js/views/RegionView.js: { weight: -2 }
js/views/VisualView.js: {} js/views/VisualView.js: { weight: -2 }
css: css:
component: component:
css/contextual.module.css: {} css/contextual.module.css: {}
......
...@@ -3,9 +3,9 @@ base: ...@@ -3,9 +3,9 @@ base:
css: css:
# Adjust the weights to load these early. # Adjust the weights to load these early.
component: component:
css/system.module.css: { every_page: true } css/system.module.css: { every_page: true, weight: -10, }
theme: theme:
css/system.theme.css: { every_page: true } css/system.theme.css: { every_page: true, weight: -10 }
dependencies: dependencies:
- core/normalize - core/normalize
...@@ -13,7 +13,7 @@ admin: ...@@ -13,7 +13,7 @@ admin:
version: VERSION version: VERSION
css: css:
theme: theme:
css/system.admin.css: {} css/system.admin.css: { weight: -10 }
dependencies: dependencies:
- system/base - system/base
...@@ -21,7 +21,7 @@ maintenance: ...@@ -21,7 +21,7 @@ maintenance:
version: VERSION version: VERSION
css: css:
theme: theme:
css/system.maintenance.css: {} css/system.maintenance.css: { weight: -10 }
dependencies: dependencies:
- system/base - system/base
- system/admin - system/admin
......
...@@ -21,7 +21,7 @@ views.contextual-links: ...@@ -21,7 +21,7 @@ views.contextual-links:
version: VERSION version: VERSION
js: js:
# Ensure to run before contextual/drupal.contextual-links. # Ensure to run before contextual/drupal.contextual-links.
js/views-contextual.js: {} js/views-contextual.js: { weight: -10 }
dependencies: dependencies:
- core/jquery - core/jquery
- core/drupal - core/drupal
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment