diff --git a/core/assets/vendor/classList/README.md b/core/assets/vendor/classList/README.md new file mode 100644 index 0000000..dd7359c --- /dev/null +++ b/core/assets/vendor/classList/README.md @@ -0,0 +1,7 @@ +classList.js is a cross-browser JavaScript shim that fully implements `element.classList`. Refer to [the MDN page on `element.classList`][1] for more information. + + +![Tracking image](https://in.getclicky.com/212712ns.gif) + + + [1]: https://developer.mozilla.org/en/DOM/element.classList "MDN / DOM / element.classList" diff --git a/core/assets/vendor/classList/classList.js b/core/assets/vendor/classList/classList.js new file mode 100644 index 0000000..1faaec8 --- /dev/null +++ b/core/assets/vendor/classList/classList.js @@ -0,0 +1,179 @@ +/* + * classList.js: Cross-browser full element.classList implementation. + * 2012-11-15 + * + * By Eli Grey, http://eligrey.com + * Public Domain. + * NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. + */ + +/*global self, document, DOMException */ + +/*! @source http://purl.eligrey.com/github/classList.js/blob/master/classList.js*/ + +if ("document" in self && !( + "classList" in document.createElement("_") && + "classList" in document.createElementNS("http://www.w3.org/2000/svg", "svg") + )) { + +(function (view) { + +"use strict"; + +if (!('Element' in view)) return; + +var + classListProp = "classList" + , protoProp = "prototype" + , elemCtrProto = view.Element[protoProp] + , objCtr = Object + , strTrim = String[protoProp].trim || function () { + return this.replace(/^\s+|\s+$/g, ""); + } + , arrIndexOf = Array[protoProp].indexOf || function (item) { + var + i = 0 + , len = this.length + ; + for (; i < len; i++) { + if (i in this && this[i] === item) { + return i; + } + } + return -1; + } + // Vendors: please allow content code to instantiate DOMExceptions + , DOMEx = function (type, message) { + this.name = type; + this.code = DOMException[type]; + this.message = message; + } + , checkTokenAndGetIndex = function (classList, token) { + if (token === "") { + throw new DOMEx( + "SYNTAX_ERR" + , "An invalid or illegal string was specified" + ); + } + if (/\s/.test(token)) { + throw new DOMEx( + "INVALID_CHARACTER_ERR" + , "String contains an invalid character" + ); + } + return arrIndexOf.call(classList, token); + } + , ClassList = function (elem) { + var + trimmedClasses = strTrim.call(elem.getAttribute("class") || "") + , classes = trimmedClasses ? trimmedClasses.split(/\s+/) : [] + , i = 0 + , len = classes.length + ; + for (; i < len; i++) { + this.push(classes[i]); + } + this._updateClassName = function () { + elem.setAttribute("class", this.toString()); + }; + } + , classListProto = ClassList[protoProp] = [] + , classListGetter = function () { + return new ClassList(this); + } +; +// Most DOMException implementations don't allow calling DOMException's toString() +// on non-DOMExceptions. Error's toString() is sufficient here. +DOMEx[protoProp] = Error[protoProp]; +classListProto.item = function (i) { + return this[i] || null; +}; +classListProto.contains = function (token) { + token += ""; + return checkTokenAndGetIndex(this, token) !== -1; +}; +classListProto.add = function () { + var + tokens = arguments + , i = 0 + , l = tokens.length + , token + , updated = false + ; + do { + token = tokens[i] + ""; + if (checkTokenAndGetIndex(this, token) === -1) { + this.push(token); + updated = true; + } + } + while (++i < l); + + if (updated) { + this._updateClassName(); + } +}; +classListProto.remove = function () { + var + tokens = arguments + , i = 0 + , l = tokens.length + , token + , updated = false + ; + do { + token = tokens[i] + ""; + var index = checkTokenAndGetIndex(this, token); + if (index !== -1) { + this.splice(index, 1); + updated = true; + } + } + while (++i < l); + + if (updated) { + this._updateClassName(); + } +}; +classListProto.toggle = function (token, forse) { + token += ""; + + var + result = this.contains(token) + , method = result ? + forse !== true && "remove" + : + forse !== false && "add" + ; + + if (method) { + this[method](token); + } + + return !result; +}; +classListProto.toString = function () { + return this.join(" "); +}; + +if (objCtr.defineProperty) { + var classListPropDesc = { + get: classListGetter + , enumerable: true + , configurable: true + }; + try { + objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc); + } catch (ex) { // IE 8 doesn't support enumerable:true + if (ex.number === -0x7FF5EC54) { + classListPropDesc.enumerable = false; + objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc); + } + } +} else if (objCtr[protoProp].__defineGetter__) { + elemCtrProto.__defineGetter__(classListProp, classListGetter); +} + +}(self)); + +} diff --git a/core/assets/vendor/classList/classList.min.js b/core/assets/vendor/classList/classList.min.js index 99b828c..fa98825 100644 --- a/core/assets/vendor/classList/classList.min.js +++ b/core/assets/vendor/classList/classList.min.js @@ -1,2 +1,2 @@ -/*! @source http://purl.eligrey.com/github/classList.js/blob/master/classList.js */ -if("document" in self){if(!("classList" in document.createElement("_"))){(function(j){"use strict";if(!("Element" in j)){return}var a="classList",f="prototype",m=j.Element[f],b=Object,k=String[f].trim||function(){return this.replace(/^\s+|\s+$/g,"")},c=Array[f].indexOf||function(q){var p=0,o=this.length;for(;p1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery); \ No newline at end of file +(function(b){b.support.touch="ontouchend" in document;if(!b.support.touch){return;}var c=b.ui.mouse.prototype,e=c._mouseInit,a;function d(g,h){if(g.originalEvent.touches.length>1){return;}g.preventDefault();var i=g.originalEvent.changedTouches[0],f=document.createEvent("MouseEvents");f.initMouseEvent(h,true,true,window,1,i.screenX,i.screenY,i.clientX,i.clientY,false,false,false,false,0,null);g.target.dispatchEvent(f);}c._touchStart=function(g){var f=this;if(a||!f._mouseCapture(g.originalEvent.changedTouches[0])){return;}a=true;f._touchMoved=false;d(g,"mouseover");d(g,"mousemove");d(g,"mousedown");};c._touchMove=function(f){if(!a){return;}this._touchMoved=true;d(f,"mousemove");};c._touchEnd=function(f){if(!a){return;}d(f,"mouseup");d(f,"mouseout");if(!this._touchMoved){d(f,"click");}a=false;};c._mouseInit=function(){var f=this;f.element.bind("touchstart",b.proxy(f,"_touchStart")).bind("touchmove",b.proxy(f,"_touchMove")).bind("touchend",b.proxy(f,"_touchEnd"));e.call(f);};})(jQuery); \ No newline at end of file diff --git a/core/assets/vendor/normalize-css/CHANGELOG.md b/core/assets/vendor/normalize-css/CHANGELOG.md new file mode 100644 index 0000000..5c358be --- /dev/null +++ b/core/assets/vendor/normalize-css/CHANGELOG.md @@ -0,0 +1,76 @@ +=== HEAD + +=== 3.0.1 (March 27, 2014) + +* Add package.json for npm support. + +=== 3.0.0 (January 28, 2014) + +=== 3.0.0-rc.1 (January 26, 2014) + +* Explicit tests for each normalization. +* Fix i18n for `q` element. +* Fix `pre` text formatting and overflow. +* Fix vertical alignment of `progress`. +* Address `button` overflow in IE 8/9/10. +* Revert `textarea` alignment modification. +* Fix number input button cursor in Chrome on OS X. +* Remove `a:focus` outline normalization. +* Fix `figure` margin normalization. +* Normalize `optgroup`. +* Remove default table cell padding. +* Set correct display for `progress` in IE 8/9. +* Fix `font` and `color` inheritance for forms. + +=== 2.1.3 (August 26, 2013) + +* Fix component.json. +* Remove the gray background color from active links in IE 10. + +=== 2.1.2 (May 11, 2013) + +* Revert root `color` and `background` normalizations. + +=== 2.1.1 (April 8, 2013) + +* Normalize root `color` and `background` to counter the effects of system + color schemes. + +=== 2.1.0 (January 21, 2013) + +* Normalize `text-transform` for `button` and `select`. +* Normalize `h1` margin when within HTML5 sectioning elements. +* Normalize `hr` element. +* Remove unnecessary `pre` styles. +* Add `main` element to HTML5 display definitions. +* Fix cursor style for disabled button `input`. + +=== 2.0.1 (August 20, 2012) + +* Remove stray IE 6/7 `inline-block` hack from HTML5 display settings. + +=== 2.0.0 (August 19, 2012) + +* Remove legacy browser form normalizations. +* Remove all list normalizations. +* Add `quotes` normalizations. +* Remove all heading normalizations except `h1` font size. +* Form elements automatically inherit `font-family` from ancestor. +* Drop support for IE 6/7, Firefox < 4, and Safari < 5. + +=== 1.0.1 (August 19, 2012) + +* Adjust `small` font size normalization. + +=== 1.0.0 (August 14, 2012) + +(Only the notable changes since public release) + +* Add MIT License. +* Hide `audio` elements without controls in iOS 5 (#69). +* Normalize heading margins and font size. +* Move font-family normalization from `body` to `html` (#62). +* Remove scrollbar normalization (#64 #65). +* Remove excess padding from checkbox and radio inputs in IE 7 (#42). +* Add IE9 correction for SVG overflow (#16). +* Add fix for legend not inheriting color in IE 6/7/8/9. diff --git a/core/assets/vendor/normalize-css/CONTRIBUTING.md b/core/assets/vendor/normalize-css/CONTRIBUTING.md new file mode 100644 index 0000000..abcbae2 --- /dev/null +++ b/core/assets/vendor/normalize-css/CONTRIBUTING.md @@ -0,0 +1,177 @@ +# Contributing to normalize.css + +Please take a moment to review this document in order to make the contribution +process easy and effective for everyone involved. + +Following these guidelines helps to communicate that you respect the time of +the developers managing and developing this open source project. In return, +they should reciprocate that respect in addressing your issue or assessing +patches and features. + + +## Using the issue tracker + +The issue tracker is the preferred channel for [bug reports](#bugs), +[features requests](#features) and [submitting pull +requests](#pull-requests), but please respect the following restrictions: + +* Please **do not** use the issue tracker for personal support requests. + +* Please **do not** derail or troll issues. Keep the discussion on topic and + respect the opinions of others. + + + +## Bug reports + +A bug is a _demonstrable problem_ that is caused by the code in the repository. +Good bug reports are extremely helpful - thank you! + +Guidelines for bug reports: + +1. **Use the GitHub issue search** – check if the issue has already been + reported. + +2. **Check if the issue has been fixed** – try to reproduce it using the + latest `master` branch in the repository. + +3. **Isolate the problem** – create a live example (e.g., on + [Codepen](http://codepen.io)) of a [reduced test + case](http://css-tricks.com/6263-reduced-test-cases/). + +A good bug report shouldn't leave others needing to chase you up for more +information. Please try to be as detailed as possible in your report. What is +your environment? What steps will reproduce the issue? What browser(s) and OS +experience the problem? What would you expect to be the outcome? All these +details will help people to fix any potential bugs. + +Example: + +> Short and descriptive example bug report title +> +> A summary of the issue and the browser/OS environment in which it occurs. If +> suitable, include the steps required to reproduce the bug. +> +> 1. This is the first step +> 2. This is the second step +> 3. Further steps, etc. +> +> `` - a link to the reduced test case +> +> Any other information you want to share that is relevant to the issue being +> reported. This might include the lines of code that you have identified as +> causing the bug, and potential solutions (and your opinions on their +> merits). + + + +## Feature requests + +Feature requests are welcome. But take a moment to find out whether your idea +fits with the scope and aims of the project. It's up to *you* to make a strong +case to convince the project's developers of the merits of this feature. Please +provide as much detail and context as possible. + + + +## Pull requests + +Good pull requests - patches, improvements, new features - are a fantastic +help. They should remain focused in scope and avoid containing unrelated +commits. + +**Please ask first** before embarking on any significant work, otherwise you +risk spending a lot of time working on something that the project's developers +might not want to merge into the project. + +Please adhere to the coding conventions used throughout a project (whitespace, +accurate comments, etc.) and any other requirements (such as test coverage). + +Follow this process if you'd like your work considered for inclusion in the +project: + +1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, + and configure the remotes: + + ```bash + # Clone your fork of the repo into the current directory + git clone https://github.com//normalize.css + # Navigate to the newly cloned directory + cd normalize.css + # Assign the original repo to a remote called "upstream" + git remote add upstream https://github.com/necolas/normalize.css + ``` + +2. If you cloned a while ago, get the latest changes from upstream: + + ```bash + git checkout master + git pull upstream master + ``` + +3. Never work directly on `master`. Create a new topic branch (off the latest + version of `master`) to contain your feature, change, or fix: + + ```bash + git checkout -b + ``` + +4. Commit your changes in logical chunks. Please adhere to these [git commit + message conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) + or your code is unlikely be merged into the main project. Use Git's + [interactive rebase](https://help.github.com/articles/interactive-rebase) + feature to tidy up your commits before making them public. + + Make sure to add a test to the `test.html` file if appropriate, and test + your change in all supported browsers. + +5. Locally rebase the upstream development branch into your topic branch: + + ```bash + git pull --rebase upstream master + ``` + +6. Push your topic branch up to your fork: + + ```bash + git push origin + ``` + +10. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) + with a clear title and description. + + Please submit a separate pull request for any appropriate changes required + in the `v1` branch for legacy browsers. + +**IMPORTANT**: By submitting a patch, you agree to allow the project owner to +license your work under the same license as that used by the project. + + + +## Maintainers + +If you have commit access, please follow this process for merging patches and +cutting new releases. + +### Accepting patches + +1. Check that a patch is within the scope and philosophy of the project. +2. Check that a patch has any necessary tests and a proper, descriptive commit + message. +3. Test the patch locally. +4. Do not use GitHub's merge button. Apply the patch to `master` locally + (either via `git am` or by checking the whole branch out). Amend minor + problems with the author's original commit if necessary. Then push to GitHub. +5. If a patch should be included in `v1`, cherry-pick the commits or manually + apply if all else fails. + +### Releasing a new version + +1. Include all new functional changes in the CHANGELOG. +2. Use a dedicated commit to increment the version. The version needs to be + added to the CHANGELOG (inc. date), and the `bower.json`, `component.json`, + and `normalize.css` files. +3. The commit message must be of `v0.0.0` format. +4. Create an annotated tag for the version: `git tag -m "v0.0.0" 0.0.0`. +5. Push the changes and tags to GitHub: `git push --tags origin master` +6. Checkout the `gh-pages` branch and follow the instructions in the README. diff --git a/core/assets/vendor/normalize-css/LICENSE.md b/core/assets/vendor/normalize-css/LICENSE.md new file mode 100644 index 0000000..c6bcc9b --- /dev/null +++ b/core/assets/vendor/normalize-css/LICENSE.md @@ -0,0 +1,19 @@ +Copyright (c) Nicolas Gallagher and Jonathan Neal + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/core/assets/vendor/normalize-css/README.md b/core/assets/vendor/normalize-css/README.md new file mode 100644 index 0000000..80ec51a --- /dev/null +++ b/core/assets/vendor/normalize-css/README.md @@ -0,0 +1,57 @@ +# normalize.css v3 + +Normalize.css is a customisable CSS file that makes browsers render all +elements more consistently and in line with modern standards. + +The project relies on researching the differences between default browser +styles in order to precisely target only the styles that need or benefit from +normalizing. + +[View the test file](http://necolas.github.io/normalize.css/latest/test.html) + +## Install + +Download from the [project page](http://necolas.github.io/normalize.css/). + +Install with [Component(1)](https://github.com/component/component/): `component install necolas/normalize.css` + +Install with [npm](http://npmjs.org/): `npm install --save normalize.css` + +Install with [Bower](http://bower.io/): `bower install --save normalize.css` + +## What does it do? + +* Preserves useful defaults, unlike many CSS resets. +* Normalizes styles for a wide range of elements. +* Corrects bugs and common browser inconsistencies. +* Improves usability with subtle improvements. +* Explains what code does using detailed comments. + +## How to use it + +No other styles should come before Normalize.css. + +It is recommended that you include the `normalize.css` file as untouched +library code. + +## Browser support + +* Google Chrome (latest) +* Mozilla Firefox (latest) +* Mozilla Firefox 4 +* Opera (latest) +* Apple Safari 6+ +* Internet Explorer 8+ + +[Normalize.css v1 provides legacy browser +support](https://github.com/necolas/normalize.css/tree/v1) (IE 6+, Safari 4+), +but is no longer actively developed. + +## Contributing + +Please read the CONTRIBUTING.md + +## Acknowledgements + +Normalize.css is a project by [Nicolas Gallagher](https://github.com/necolas), +co-created with [Jonathan Neal](https://github.com/jonathantneal). diff --git a/core/assets/vendor/normalize-css/bower.json b/core/assets/vendor/normalize-css/bower.json new file mode 100644 index 0000000..9ddcdd0 --- /dev/null +++ b/core/assets/vendor/normalize-css/bower.json @@ -0,0 +1,13 @@ +{ + "name": "normalize-css", + "version": "3.0.1", + "main": "normalize.css", + "author": "Nicolas Gallagher", + "ignore": [ + "CHANGELOG.md", + "CONTRIBUTING.md", + "component.json", + "package.json", + "test.html" + ] +} diff --git a/core/assets/vendor/normalize-css/component.json b/core/assets/vendor/normalize-css/component.json new file mode 100644 index 0000000..ac21fb1 --- /dev/null +++ b/core/assets/vendor/normalize-css/component.json @@ -0,0 +1,8 @@ +{ + "name": "normalize.css", + "repo": "necolas/normalize.css", + "version": "3.0.1", + "styles": ["normalize.css"], + "author": "Nicolas Gallagher", + "license": "MIT" +} diff --git a/core/assets/vendor/normalize-css/normalize.css b/core/assets/vendor/normalize-css/normalize.css index 81c6f31..08f8950 100644 --- a/core/assets/vendor/normalize-css/normalize.css +++ b/core/assets/vendor/normalize-css/normalize.css @@ -1,4 +1,4 @@ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ /** * 1. Set default font family to sans-serif. @@ -25,8 +25,7 @@ body { /** * Correct `block` display not defined for any HTML5 element in IE 8/9. - * Correct `block` display not defined for `details` or `summary` in IE 10/11 - * and Firefox. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. * Correct `block` display not defined for `main` in IE 11. */ @@ -39,7 +38,6 @@ footer, header, hgroup, main, -menu, nav, section, summary { @@ -87,7 +85,7 @@ template { */ a { - background-color: transparent; + background: transparent; } /** @@ -424,4 +422,4 @@ table { td, th { padding: 0; -} \ No newline at end of file +} diff --git a/core/assets/vendor/normalize-css/package.json b/core/assets/vendor/normalize-css/package.json new file mode 100644 index 0000000..19afaa3 --- /dev/null +++ b/core/assets/vendor/normalize-css/package.json @@ -0,0 +1,17 @@ +{ + "name": "normalize.css", + "version": "3.0.1", + "description": "Normalize.css as a node packaged module", + "style": "normalize.css", + "files": [ + "normalize.css", + "component.json" + ], + "homepage": "http://necolas.github.io/normalize.css", + "repository": { + "type": "git", + "url": "git://github.com/necolas/normalize.css.git" + }, + "author": "Nicolas Gallagher", + "license": "MIT" +} diff --git a/core/assets/vendor/normalize-css/test.html b/core/assets/vendor/normalize-css/test.html new file mode 100644 index 0000000..03d2bf6 --- /dev/null +++ b/core/assets/vendor/normalize-css/test.html @@ -0,0 +1,508 @@ + + + + +Normalize CSS: UI tests + + + + +
+ . + +

Normalize.css: UI tests

+ +

html

+

should have sans-serif font family (opinionated)

+
+ abcdefghijklmnopqrstuvwxyz +
+ +

body

+

should have no margin (opinionated)

+
+ (there should be no red background visible on this page) +
+ +

article, aside, details, figure, figcaption, footer, header, hgroup, main, nav, section, summary

+

should render as block

+
+
article
+ +
+ summary + details +
+
+ figure +
figcaption
+
+
footer
+
header
+
hgroup
+
main
+ +
section
+
+ +

audio, canvas, progress, video

+

should render as inline-block and baseline-aligned

+
+ + canvas + progress + +
+ +

audio:not([controls]), template, [hidden]

+

should not display

+
+ + + +
+ +

a

+

should have a transparent background when active

+
+ dummy anchor +
+

should not have a focus outline when both focused and hovered (opinionated)

+
+ dummy anchor +
+ +

abbr[title]

+

should have a dotted bottom border

+
+ abbr +
+ +

b, strong

+

should have bold font-weight

+
+ b + strong +
+ +

dfn

+

should have italic font-style

+
+ dfn +
+ +

h1

+

should not change size within an article

+
+

Heading (control)

+
+

Heading (in article)

+
+
+

should not change size within a section

+
+

Heading (control)

+
+

Heading (in section)

+
+
+ +

mark

+

should have a yellow background

+
+ mark +
+ +

small

+

should render equally small in all browsers

+
+ control. small. +
+ +

sub and sup

+

should not affect a line's visual line-height

+
+

control.

+

control. sub.

+

control. sup.

+
+ +

img

+

should not have a border when wrapped in an anchor

+
+ + + + +
+ +

svg

+

should not overflow

+
+ + + +
+ +

figure

+

should have margins

+
+
+ +
+
+ +

hr

+

should have a content-box box model

+
+
+
+ +

pre

+

should trigger a scrollbar when too wide for its container

+
+ 
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et me.
+
+ +

code, kbd, pre, samp

+

should render em-unit preformatted text at the same absolute size as normal text

+
+ span: abcdefghijklmnopqrstuvwxyz.
+ code: abcdefghijklmnopqrstuvwxyz.
+ kbd: abcdefghijklmnopqrstuvwxyz.
+ samp: abcdefghijklmnopqrstuvwxyz. + 
pre: abcdefghijklmnopqrstuvwxyz.
+
+ +

button, input, optgroup, select, textarea

+

should inherit color from ancestor

+
+
+
+
+ +
+

should inherit font from ancestor

+
+
+
+
+ +
+

should not have margins

+
+ + + + + +
+ +

button

+

should have visible overflow

+
+ + +
+ +

button, select

+

should not inherit text-transform

+
+ + +
+ +

button and button-style input

+

should have pointer cursor style

+
+

+

+

+

+

+
+

should be styleable

+
+ +

+

+

+

+

+
+ +

disabled button and input

+

should have default cursor style

+
+

+

+

+

+

+
+ +

button, input

+

should not have extra inner padding in Firefox

+
+ +

+

+

+

+

+
+ +

input

+

should not inherit line-height

+
+ +
+ +

input[type="checkbox"], input[type="radio"]

+

should have a border-box box model

+
+ + + +
+

should not have padding

+
+ + +
+ +

input[type="number"]

+

should display a default cursor for the decrement button's click target in Chrome

+
+ +
+ +

input[type="search"]

+

should be styleable

+
+ +
+

should have a content-box box model

+
+
+ +
+
+

should not have a cancel button in Safari or Chrome

+
+ +
+ +

fieldset

+

should have consistent border, padding, and margin

+
+
+
+
+
+ +

legend

+

should inherit color

+
+
+ legend +
+
+

should not have padding

+
+
+ legend +
+
+ +

textarea

+

should not have a scrollbar unless overflowing

+
+ +
+ +

table

+

should not have spaces between cells

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Jimi Hendrix - albums
AlbumYearPrice
AlbumYearPrice
Are You Experienced1967$10.00
Axis: Bold as Love1967$12.00
Electric Ladyland1968$10.00
Band of Gypsys1970$12.00
+
+ +
diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml index 4afb536..f6442f7 100644 --- a/core/config/schema/core.entity.schema.yml +++ b/core/config/schema/core.entity.schema.yml @@ -251,7 +251,7 @@ field.formatter.settings.number_decimal: field.formatter.settings.number_integer: type: mapping - label: 'Number integer display format settings' + label: 'Number interger display format settings' mapping: thousand_separator: type: string diff --git a/core/core.libraries.yml b/core/core.libraries.yml index 1a36202..5324b86 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -14,10 +14,11 @@ backbone: classList: remote: https://github.com/eligrey/classList.js - version: 2014-12-13 + # @todo Stable release required for Drupal 8.0. + version: master license: name: Public Domain - url: https://github.com/eligrey/classList.js/blob/2014-12-13/LICENSE.md + url: https://github.com/eligrey/classList.js/blob/master/LICENSE.md gpl-compatible: true js: assets/vendor/classList/classList.min.js: { weight: -21, browsers: { IE: 'lte IE 9', '!IE': false }, minified: true } @@ -764,7 +765,7 @@ jquery.ui.tooltip: jquery.ui.touch-punch: remote: https://github.com/furf/jquery-ui-touch-punch - version: 0.2.3 + version: 0.2.2 license: name: GNU-GPL-2.0-or-later url: https://github.com/furf/jquery-ui-touch-punch @@ -812,7 +813,7 @@ modernizr: normalize: remote: https://github.com/necolas/normalize.css - version: 3.0.2 + version: 3.0.1 license: name: MIT url: https://github.com/necolas/normalize.css/blob/master/LICENSE.md diff --git a/core/core.services.yml b/core/core.services.yml index 73c7873..b3c4ffe 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -823,7 +823,7 @@ services: arguments: ['@language_manager', '@config.factory', '@page_cache_request_policy', '@page_cache_response_policy'] redirect_response_subscriber: class: Drupal\Core\EventSubscriber\RedirectResponseSubscriber - arguments: ['@url_generator', '@router.request_context'] + arguments: ['@url_generator'] tags: - { name: event_subscriber } request_close_subscriber: diff --git a/core/includes/pager.inc b/core/includes/pager.inc index a2483ab..05be5c8 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -304,11 +304,8 @@ function pager_query_add_page(array $query, $element, $index) { if ($new_page = implode(',', pager_load_array($page_new[$element], $element, explode(',', $page)))) { $query['page'] = $new_page; } - // Merge the query parameters passed to this function with the parameters - // from the current request. In case of collision, the parameters passed - // into this function take precedence. - if ($current_request_query = pager_get_query_parameters()) { - $query = array_merge($current_request_query, $query); + if ($query_pager = pager_get_query_parameters()) { + $query = array_merge($query, $query_pager); } return $query; } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 5f58419..27573e7 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1343,15 +1343,8 @@ function template_preprocess_html(&$variables) { // Add a variable for the root path. This can be used to create a class and // theme the page depending on the current path (e.g. node, admin, user) as // well as more specific data like path-frontpage. - $is_front_page = \Drupal::service('path.matcher')->isFrontPage(); - - if ($is_front_page) { - $variables['root_path'] = TRUE; - } - else { - $system_path = \Drupal::request()->attributes->get('_system_path'); - $variables['root_path'] = explode('/', $system_path)[0]; - } + $path = \Drupal::request()->getPathInfo(); + $variables['root_path'] = explode('/', $path)[1]; $site_config = \Drupal::config('system.site'); // Construct page title. @@ -1363,7 +1356,7 @@ function template_preprocess_html(&$variables) { } // @todo Remove once views is not bypassing the view subscriber anymore. // @see http://drupal.org/node/2068471 - elseif ($is_front_page) { + elseif (drupal_is_front_page()) { $head_title = array( 'title' => t('Home'), 'name' => String::checkPlain($site_config->get('name')), diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php index 373a779..f2e25c5 100644 --- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php +++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php @@ -48,28 +48,11 @@ public function build($class_name) { EOS; $class_start = 'class {{ proxy_class_name }}'; - // For cases in which the implemented interface is a child of another - // interface, getInterfaceNames() also returns the parent. This causes a - // PHP error. - // In order to avoid that, check for each interface, whether one of its - // parents is also in the list and exclude it. - if ($interfaces = $reflection->getInterfaces()) { - foreach ($interfaces as $interface_name => $interface) { - // Exclude all parents from the list of implemented interfaces of the - // class. - if ($parent_interfaces = $interface->getInterfaceNames()) { - foreach ($parent_interfaces as $parent_interface) { - if (isset($interfaces[$parent_interface])) {} - unset($interfaces[$parent_interface]); - } - } + if ($interfaces = $reflection->getInterfaceNames()) { + foreach ($interfaces as &$interface) { + $interface = '\\' . $interface; } - - $interface_names = []; - foreach ($interfaces as $interface) { - $interface_names[] = '\\' . $interface->getName(); - } - $class_start .= ' implements ' . implode(', ', $interface_names); + $class_start .= ' implements ' . implode(', ', $interfaces); } $output .= $this->buildUseStatements(); @@ -119,7 +102,7 @@ public function build($class_name) { $output .= implode("\n", $methods); // Indent the output. - $output = implode("\n", array_map(function ($value) { + $output = implode("\n", array_map(function($value) { if ($value === '') { return $value; } @@ -191,7 +174,7 @@ protected function buildMethod(\ReflectionMethod $reflection_method) { $output .= $this->buildMethodBody($reflection_method); - $output .= "\n" . '}'; + $output .= "\n". '}'; return $output; } diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyDumper.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyDumper.php index 7126062..99eae59 100644 --- a/core/lib/Drupal/Component/ProxyBuilder/ProxyDumper.php +++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyDumper.php @@ -16,13 +16,6 @@ class ProxyDumper implements DumperInterface { /** - * Keeps track of already existing proxy classes. - * - * @var array - */ - protected $buildClasses = []; - - /** * The proxy builder. * * @var \Drupal\Component\ProxyBuilder\ProxyBuilder @@ -63,16 +56,7 @@ public function getProxyFactoryCode(Definition $definition, $id) { * {@inheritdoc} */ public function getProxyCode(Definition $definition) { - // Maybe the same class is used in different services, which are both marked - // as lazy (just think about 2 database connections). - // In those cases we should not generate proxy code the second time. - if (!isset($this->buildClasses[$definition->getClass()])) { - $this->buildClasses[$definition->getClass()] = TRUE; - return $this->builder->build($definition->getClass()); - } - else { - return ''; - } + return $this->builder->build($definition->getClass()); } } diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php index c02a132..72ae554 100644 --- a/core/lib/Drupal/Core/Config/ConfigInstaller.php +++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php @@ -22,11 +22,11 @@ class ConfigInstaller implements ConfigInstallerInterface { protected $configFactory; /** - * The active configuration storages, keyed by collection. + * The active configuration storage. * - * @var \Drupal\Core\Config\StorageInterface[] + * @var \Drupal\Core\Config\StorageInterface */ - protected $activeStorages; + protected $activeStorage; /** * The typed configuration manager. @@ -79,7 +79,7 @@ class ConfigInstaller implements ConfigInstallerInterface { */ public function __construct(ConfigFactoryInterface $config_factory, StorageInterface $active_storage, TypedConfigManagerInterface $typed_config, ConfigManagerInterface $config_manager, EventDispatcherInterface $event_dispatcher) { $this->configFactory = $config_factory; - $this->activeStorages[$active_storage->getCollectionName()] = $active_storage; + $this->activeStorage = $active_storage; $this->typedConfig = $typed_config; $this->configManager = $config_manager; $this->eventDispatcher = $event_dispatcher; @@ -119,7 +119,7 @@ public function installDefaultConfig($type, $name) { $enabled_extensions[] = 'core'; foreach ($collection_info->getCollectionNames(TRUE) as $collection) { - $config_to_install = $this->listDefaultConfigToInstall($type, $name, $collection, $enabled_extensions); + $config_to_install = $this->listDefaultConfigCollection($collection, $type, $name, $enabled_extensions); if (!empty($config_to_install)) { $this->createConfiguration($collection, $config_to_install); } @@ -130,25 +130,21 @@ public function installDefaultConfig($type, $name) { } /** - * Lists default configuration for an extension that is available to install. - * - * This looks in the extension's config/install directory and all of the - * currently enabled extensions config/install directories for configuration - * that begins with the extension's name. + * Installs default configuration for a particular collection. * + * @param string $collection + * The configuration collection to install. * @param string $type * The extension type; e.g., 'module' or 'theme'. * @param string $name * The name of the module or theme to install default configuration for. - * @param string $collection - * The configuration collection to install. * @param array $enabled_extensions * A list of all the currently enabled modules and themes. * * @return array * The list of configuration objects to create. */ - protected function listDefaultConfigToInstall($type, $name, $collection, array $enabled_extensions) { + protected function listDefaultConfigCollection($collection, $type, $name, array $enabled_extensions) { // Get all default configuration owned by this extension. $source_storage = $this->getSourceStorage($collection); $config_to_install = $source_storage->listAll($name . '.'); @@ -159,17 +155,16 @@ protected function listDefaultConfigToInstall($type, $name, $collection, array $ $extension_path = drupal_get_path($type, $name); if ($type !== 'core' && is_dir($extension_path . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY)) { $default_storage = new FileStorage($extension_path . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY, $collection); - $extension_provided_config = array_filter($default_storage->listAll(), function ($config_name) use ($config_to_install, $enabled_extensions) { - // Ensure that we have not already discovered the config to install. - if (in_array($config_name, $config_to_install)) { - return FALSE; - } - // Ensure the configuration is provided by an enabled module. + $other_module_config = array_filter($default_storage->listAll(), function ($value) use ($name) { + return !preg_match('/^' . $name . '\./', $value); + }); + + $other_module_config = array_filter($other_module_config, function ($config_name) use ($enabled_extensions) { $provider = Unicode::substr($config_name, 0, strpos($config_name, '.')); return in_array($provider, $enabled_extensions); }); - $config_to_install = array_merge($config_to_install, $extension_provided_config); + $config_to_install = array_merge($config_to_install, $other_module_config); } return $config_to_install; @@ -195,7 +190,7 @@ protected function createConfiguration($collection, array $config_to_install) { } // Remove configuration that already exists in the active storage. - $config_to_install = array_diff($config_to_install, $this->getActiveStorages($collection)->listAll()); + $config_to_install = array_diff($config_to_install, $this->getActiveStorage($collection)->listAll()); foreach ($config_to_install as $name) { // Allow config factory overriders to use a custom configuration object if @@ -205,7 +200,7 @@ protected function createConfiguration($collection, array $config_to_install) { $new_config = $overrider->createConfigObject($name, $collection); } else { - $new_config = new Config($name, $this->getActiveStorages($collection), $this->eventDispatcher, $this->typedConfig); + $new_config = new Config($name, $this->getActiveStorage($collection), $this->eventDispatcher, $this->typedConfig); } if ($data[$name] !== FALSE) { $new_config->setData($data[$name]); @@ -226,7 +221,7 @@ protected function createConfiguration($collection, array $config_to_install) { ->getStorage($entity_type); // It is possible that secondary writes can occur during configuration // creation. Updates of such configuration are allowed. - if ($this->getActiveStorages($collection)->exists($name)) { + if ($this->getActiveStorage($collection)->exists($name)) { $id = $entity_storage->getIDFromConfigName($name, $entity_storage->getEntityType()->getConfigPrefix()); $entity = $entity_storage->load($id); $entity = $entity_storage->updateFromStorageRecord($entity, $new_config->get()); @@ -295,7 +290,7 @@ public function getSourceStorage($collection = StorageInterface::DEFAULT_COLLECT // Default to using the ExtensionInstallStorage which searches extension's // config directories for default configuration. Only include the profile // configuration during Drupal installation. - $this->sourceStorage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_INSTALL_DIRECTORY, $collection, drupal_installation_attempted()); + $this->sourceStorage = new ExtensionInstallStorage($this->activeStorage, InstallStorage::CONFIG_INSTALL_DIRECTORY, $collection, drupal_installation_attempted()); } if ($this->sourceStorage->getCollectionName() != $collection) { $this->sourceStorage = $this->sourceStorage->createCollection($collection); @@ -313,11 +308,11 @@ public function getSourceStorage($collection = StorageInterface::DEFAULT_COLLECT * @return \Drupal\Core\Config\StorageInterface * The configuration storage that provides the default configuration. */ - protected function getActiveStorages($collection = StorageInterface::DEFAULT_COLLECTION) { - if (!isset($this->activeStorages[$collection])) { - $this->activeStorages[$collection] = reset($this->activeStorages)->createCollection($collection); + protected function getActiveStorage($collection = StorageInterface::DEFAULT_COLLECTION) { + if ($this->activeStorage->getCollectionName() != $collection) { + $this->activeStorage = $this->activeStorage->createCollection($collection); } - return $this->activeStorages[$collection]; + return $this->activeStorage; } /** @@ -334,31 +329,4 @@ public function setSyncing($status) { public function isSyncing() { return $this->isSyncing; } - - /** - * {@inheritdoc} - */ - public function findPreExistingConfiguration($type, $name) { - $existing_configuration = array(); - // Gather information about all the supported collections. - $collection_info = $this->configManager->getConfigCollectionInfo(); - - // Read enabled extensions directly from configuration to avoid circular - // dependencies on ModuleHandler and ThemeHandler. - $extension_config = $this->configFactory->get('core.extension'); - $enabled_extensions = array_keys((array) $extension_config->get('module')); - $enabled_extensions += array_keys((array) $extension_config->get('theme')); - // Add the extension that will be enabled to the list of enabled extensions. - $enabled_extensions[] = $name; - foreach ($collection_info->getCollectionNames(TRUE) as $collection) { - $config_to_install = $this->listDefaultConfigToInstall($type, $name, $collection, $enabled_extensions); - $active_storage = $this->getActiveStorages($collection); - foreach ($config_to_install as $config_name) { - if ($active_storage->exists($config_name)) { - $existing_configuration[$collection][] = $config_name; - } - } - } - return $existing_configuration; - } } diff --git a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php index 1d1e7e0..13e5b0e 100644 --- a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php +++ b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php @@ -84,26 +84,4 @@ public function setSyncing($status); */ public function isSyncing(); - /** - * Finds pre-existing configuration objects for the provided extension. - * - * Extensions can not be installed if configuration objects exist in the - * active storage with the same names. This can happen in a number of ways, - * commonly: - * - if a user has created configuration with the same name as that provided - * by the extension. - * - if the extension provides default configuration that does not depend on - * it and the extension has been uninstalled and is about to the - * reinstalled. - * - * @param string $type - * Type of extension to install. - * @param string $name - * Name of extension to install. - * - * @return array - * Array of configuration objects that already exist keyed by collection. - */ - public function findPreExistingConfiguration($type, $name); - } diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php index e3fcaf8..da0fa98 100644 --- a/core/lib/Drupal/Core/Config/ConfigManager.php +++ b/core/lib/Drupal/Core/Config/ConfigManager.php @@ -110,19 +110,6 @@ public function getEntityTypeIdByName($name) { /** * {@inheritdoc} */ - public function loadConfigEntityByName($name) { - $entity_type_id = $this->getEntityTypeIdByName($name); - if ($entity_type_id) { - $entity_type = $this->entityManager->getDefinition($entity_type_id); - $id = substr($name, strlen($entity_type->getConfigPrefix()) + 1); - return $this->entityManager->getStorage($entity_type_id)->load($id); - } - return NULL; - } - - /** - * {@inheritdoc} - */ public function getEntityManager() { return $this->entityManager; } diff --git a/core/lib/Drupal/Core/Config/ConfigManagerInterface.php b/core/lib/Drupal/Core/Config/ConfigManagerInterface.php index 79f4a7e..c5fdec1 100644 --- a/core/lib/Drupal/Core/Config/ConfigManagerInterface.php +++ b/core/lib/Drupal/Core/Config/ConfigManagerInterface.php @@ -24,17 +24,6 @@ public function getEntityTypeIdByName($name); /** - * Loads a configuration entity using the configuration name. - * - * @param string $name - * The configuration object name. - * - * @return \Drupal\Core\Entity\EntityInterface|null - * The configuration entity or NULL if it does not exist. - */ - public function loadConfigEntityByName($name); - - /** * Gets the entity manager. * * @return \Drupal\Core\Entity\EntityManagerInterface diff --git a/core/lib/Drupal/Core/Config/PreExistingConfigException.php b/core/lib/Drupal/Core/Config/PreExistingConfigException.php deleted file mode 100644 index 8fe8a6a..0000000 --- a/core/lib/Drupal/Core/Config/PreExistingConfigException.php +++ /dev/null @@ -1,101 +0,0 @@ -configObjects; - } - - /** - * Gets the name of the extension that is being installed. - * - * @return string - * The name of the extension that is being installed. - */ - public function getExtension() { - return $this->extension; - } - - /** - * Creates an exception for an extension and a list of configuration objects. - * - * @param $extension - * The name of the extension that is being installed. - * @param array $config_objects - * A list of configuration objects that already exist in active - * configuration, keyed by config collection. - * - * @return \Drupal\Core\Config\PreExistingConfigException - */ - public static function create($extension, array $config_objects) { - $message = String::format('Configuration objects (@config_names) provided by @extension already exist in active configuration', - array( - '@config_names' => implode(', ', static::flattenConfigObjects($config_objects)), - '@extension' => $extension - ) - ); - $e = new static($message); - $e->configObjects = $config_objects; - $e->extension = $extension; - return $e; - } - - /** - * Flattens the config object array to a single dimensional list. - * - * @param array $config_objects - * A list of configuration objects that already exist in active - * configuration, keyed by config collection. - * - * @return array - * A list of configuration objects that have been prefixed with their - * collection. - */ - public static function flattenConfigObjects(array $config_objects) { - $flat_config_objects = array(); - foreach ($config_objects as $collection => $config_names) { - $config_names = array_map(function ($config_name) use ($collection) { - if ($collection != StorageInterface::DEFAULT_COLLECTION) { - $config_name = str_replace('.', DIRECTORY_SEPARATOR, $collection) . DIRECTORY_SEPARATOR . $config_name; - } - return $config_name; - }, $config_names); - $flat_config_objects = array_merge($flat_config_objects, $config_names); - } - return $flat_config_objects; - } - -} diff --git a/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php index bcab538..c67fbf5 100644 --- a/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php @@ -8,7 +8,6 @@ namespace Drupal\Core\EventSubscriber; use Drupal\Component\Utility\UrlHelper; -use Drupal\Core\Routing\RequestContext; use Drupal\Core\Routing\UrlGeneratorInterface; use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; @@ -33,12 +32,9 @@ class RedirectResponseSubscriber implements EventSubscriberInterface { * * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator * The url generator service. - * @param \Drupal\Core\Routing\RequestContext $request_context - * The request context. */ - public function __construct(UrlGeneratorInterface $url_generator, RequestContext $request_context) { + public function __construct(UrlGeneratorInterface $url_generator) { $this->urlGenerator = $url_generator; - $this->requestContext = $request_context; } /** @@ -59,21 +55,16 @@ public function checkRedirectUrl(FilterResponseEvent $event) { // the following exception: // - Absolute URLs that point to this site (i.e. same base URL and // base path) are allowed. - if ($destination) { - if (!UrlHelper::isExternal($destination)) { - $destination = UrlHelper::parse($destination); + if ($destination && (!UrlHelper::isExternal($destination) || UrlHelper::externalIsLocal($destination, $GLOBALS['base_url']))) { + $destination = UrlHelper::parse($destination); - $path = $destination['path']; - $options['query'] = $destination['query']; - $options['fragment'] = $destination['fragment']; - // The 'Location' HTTP header contain an absolute URL. - $options['absolute'] = TRUE; + $path = $destination['path']; + $options['query'] = $destination['query']; + $options['fragment'] = $destination['fragment']; + // The 'Location' HTTP header must always be absolute. + $options['absolute'] = TRUE; - $response->setTargetUrl($this->urlGenerator->generateFromPath($path, $options)); - } - elseif (UrlHelper::externalIsLocal($destination, $this->requestContext->getCompleteBaseUrl())) { - $response->setTargetUrl($destination); - } + $response->setTargetUrl($this->urlGenerator->generateFromPath($path, $options)); } } } diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php index dba7a94..6cb8363 100644 --- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php +++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php @@ -10,8 +10,6 @@ use Drupal\Component\Serialization\Yaml; use Drupal\Core\Cache\Cache; use Drupal\Core\Cache\CacheBackendInterface; -use Drupal\Core\Config\PreExistingConfigException; -use Drupal\Core\Config\StorageInterface; use Drupal\Core\DrupalKernelInterface; use Drupal\Component\Utility\String; @@ -151,18 +149,6 @@ public function install(array $module_list, $enable_dependencies = TRUE) { ))); } - // Install profiles can not have config clashes. Configuration that - // has the same name as a module's configuration will be used instead. - if ($module != drupal_get_profile()) { - // Validate default configuration of this module. Bail if unable to - // install. Should not continue installing more modules because those - // may depend on this one. - $existing_configuration = $config_installer->findPreExistingConfiguration('module', $module); - if (!empty($existing_configuration)) { - throw PreExistingConfigException::create($module, $existing_configuration); - } - } - $extension_config ->set("module.$module", 0) ->set('module', module_config_sort($extension_config->get('module'))) diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php index d21e256..2f0fd94 100644 --- a/core/lib/Drupal/Core/Extension/ThemeHandler.php +++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php @@ -13,7 +13,6 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ConfigInstallerInterface; use Drupal\Core\Config\ConfigManagerInterface; -use Drupal\Core\Config\PreExistingConfigException; use Drupal\Core\Routing\RouteBuilderIndicatorInterface; use Drupal\Core\State\StateInterface; use Psr\Log\LoggerInterface; @@ -256,13 +255,6 @@ public function install(array $theme_list, $install_dependencies = TRUE) { ))); } - // Validate default configuration of the theme. If there is existing - // configuration then stop installing. - $existing_configuration = $this->configInstaller->findPreExistingConfiguration('theme', $key); - if (!empty($existing_configuration)) { - throw PreExistingConfigException::create($key, $existing_configuration); - } - // The value is not used; the weight is ignored for themes currently. $extension_config ->set("theme.$key", 0) diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index f1845ae..7702496 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -10,7 +10,7 @@ /** * An object containing the information for an interface language. * - * @see \Drupal\Core\Language\LanguageManager::getLanguage() + * @see language_default() */ class Language implements LanguageInterface { diff --git a/core/lib/Drupal/Core/Mail/MailManagerInterface.php b/core/lib/Drupal/Core/Mail/MailManagerInterface.php index 5cb446a..78ae865 100644 --- a/core/lib/Drupal/Core/Mail/MailManagerInterface.php +++ b/core/lib/Drupal/Core/Mail/MailManagerInterface.php @@ -31,11 +31,10 @@ * user_preferred_langcode(). If you send email based on form values filled on * the page, there are two additional choices if you are not sending the email * to a user on the site. You can either use the language used to generate the - * page or the site default language. See - * Drupal\Core\Language\LanguageManagerInterface::getDefaultLanguage(). The - * former is good if sending email to the person filling the form, the later - * is good if you send email to an address previously set up (like contact - * addresses in a contact form). + * page or the site default language. See language_default(). The former is + * good if sending email to the person filling the form, the later is good if + * you send email to an address previously set up (like contact addresses in a + * contact form). * * Taking care of always using the proper language is even more important when * sending emails in a row to multiple users. Hook_mail() abstracts whether diff --git a/core/lib/Drupal/Core/Routing/RequestContext.php b/core/lib/Drupal/Core/Routing/RequestContext.php index 2953251..2b2df99 100644 --- a/core/lib/Drupal/Core/Routing/RequestContext.php +++ b/core/lib/Drupal/Core/Routing/RequestContext.php @@ -7,7 +7,6 @@ namespace Drupal\Core\Routing; -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Routing\RequestContext as SymfonyRequestContext; @@ -20,53 +19,12 @@ class RequestContext extends SymfonyRequestContext { /** - * The scheme, host and base path, for example "http://example.com/d8". - * - * @var string - */ - protected $completeBaseUrl; - - /** * Populates the context from the current request from the request stack. * * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack - * The current request stack. */ public function fromRequestStack(RequestStack $request_stack) { $this->fromRequest($request_stack->getCurrentRequest()); } - /** - * {@inheritdoc} - */ - public function fromRequest(Request $request) { - parent::fromRequest($request); - - // @todo Extract the code in DrupalKernel::initializeRequestGlobals. - // See https://www.drupal.org/node/2404601 - if (isset($GLOBALS['base_url'])) { - $this->setCompleteBaseUrl($GLOBALS['base_url']); - } - } - - /** - * Gets the scheme, host and base path. - * - * For example, in an installation in a subdirectory "d8", it should be - * "https://example.com/d8". - */ - public function getCompleteBaseUrl() { - return $this->completeBaseUrl; - } - - /** - * Sets the complete base URL for the Request context. - * - * @param string $complete_base_url - * The complete base URL. - */ - public function setCompleteBaseUrl($complete_base_url) { - $this->completeBaseUrl = $complete_base_url; - } - } diff --git a/core/lib/Drupal/Core/Session/UserSession.php b/core/lib/Drupal/Core/Session/UserSession.php index 6af360d..92629d5 100644 --- a/core/lib/Drupal/Core/Session/UserSession.php +++ b/core/lib/Drupal/Core/Session/UserSession.php @@ -188,7 +188,7 @@ function getPreferredLangcode($fallback_to_default = TRUE) { return $language_list[$this->preferred_langcode]->getId(); } else { - return $fallback_to_default ? \Drupal::languageManager()->getDefaultLanguage()->getId() : ''; + return $fallback_to_default ? language_default()->getId() : ''; } } @@ -201,7 +201,7 @@ function getPreferredAdminLangcode($fallback_to_default = TRUE) { return $language_list[$this->preferred_admin_langcode]->getId(); } else { - return $fallback_to_default ? \Drupal::languageManager()->getDefaultLanguage()->getId() : ''; + return $fallback_to_default ? language_default()->getId() : ''; } } diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php index 0c1ee37..eb2306a 100644 --- a/core/lib/Drupal/Core/Template/TwigExtension.php +++ b/core/lib/Drupal/Core/Template/TwigExtension.php @@ -109,7 +109,7 @@ public function getFilters() { // CSS class and ID filters. new \Twig_SimpleFilter('clean_class', '\Drupal\Component\Utility\Html::getClass'), - new \Twig_SimpleFilter('clean_id', '\Drupal\Component\Utility\Html::getId'), + new \Twig_SimpleFilter('clean_id', 'drupal_clean_id_identifier'), ); } diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php index 273d264..aa25cc6 100644 --- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php +++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php @@ -43,7 +43,7 @@ class Language extends TypedData { */ public function getValue() { if (!isset($this->language) && $this->id) { - $this->language = \Drupal::languageManager()->getLanguage($this->id); + $this->language = language_load($this->id); } return $this->language; } diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php deleted file mode 100644 index 54ace9e..0000000 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php +++ /dev/null @@ -1,43 +0,0 @@ -getFieldDefinition()->getName(); - /** @var \Drupal\Core\Entity\EntityInterface $entity */ - $entity = $items->getEntity(); - $entity_type_id = $entity->getEntityTypeId(); - $id_key = $entity->getEntityType()->getKey('id'); - - $value_taken = (bool) \Drupal::entityQuery($entity_type_id) - // The id could be NULL, so we cast it to 0 in that case. - ->condition($id_key, (int) $items->getEntity()->id(), '<>') - ->condition($field_name, db_like($items->first()->value), 'LIKE') - ->range(0, 1) - ->count() - ->execute(); - - if ($value_taken) { - $this->context->addViolation($constraint->message, array("%value" => $items->value)); - } - } -} diff --git a/core/modules/action/src/Plugin/Action/EmailAction.php b/core/modules/action/src/Plugin/Action/EmailAction.php index ae9bd00..d93152d 100644 --- a/core/modules/action/src/Plugin/Action/EmailAction.php +++ b/core/modules/action/src/Plugin/Action/EmailAction.php @@ -11,7 +11,6 @@ use Drupal\Core\Action\ConfigurableActionBase; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Mail\MailManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Session\AccountInterface; @@ -58,12 +57,6 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug */ protected $mailManager; - /** The language manager. - * - * @var \Drupal\Core\Language\LanguageManagerInterface - */ - protected $languageManager; - /** * Constructs a EmailAction object. * @@ -81,17 +74,14 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug * A logger instance. * @param \Drupal\Core\Mail\MailManagerInterface * The mail manager. - * @param \Drupal\Core\Language\LanguageManagerInterface - * The language manager. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, Token $token, EntityManagerInterface $entity_manager, LoggerInterface $logger, MailManagerInterface $mail_manager, LanguageManagerInterface $language_manager) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, Token $token, EntityManagerInterface $entity_manager, LoggerInterface $logger, MailManagerInterface $mail_manager) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->token = $token; $this->storage = $entity_manager->getStorage('user'); $this->logger = $logger; $this->mailManager = $mail_manager; - $this->languageManager = $language_manager; } /** @@ -102,8 +92,7 @@ public static function create(ContainerInterface $container, array $configuratio $container->get('token'), $container->get('entity.manager'), $container->get('logger.factory')->get('action'), - $container->get('plugin.manager.mail'), - $container->get('language_manager') + $container->get('plugin.manager.mail') ); } @@ -126,7 +115,7 @@ public function execute($entity = NULL) { $langcode = $recipient_account->getPreferredLangcode(); } else { - $langcode = $this->languageManager->getDefaultLanguage()->getId(); + $langcode = language_default()->getId(); } $params = array('context' => $this->configuration); diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php index 6f3d2e2..7f0c287 100644 --- a/core/modules/aggregator/src/Entity/Feed.php +++ b/core/modules/aggregator/src/Entity/Feed.php @@ -150,8 +150,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { 'type' => 'string_textfield', 'weight' => -5, )) - ->setDisplayConfigurable('form', TRUE) - ->addConstraint('FeedTitle', []); + ->setDisplayConfigurable('form', TRUE); $fields['langcode'] = BaseFieldDefinition::create('language') ->setLabel(t('Language code')) @@ -172,8 +171,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { 'type' => 'uri', 'weight' => -3, )) - ->setDisplayConfigurable('form', TRUE) - ->addConstraint('FeedUrl', []); + ->setDisplayConfigurable('form', TRUE); $intervals = array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200); $period = array_map(array(\Drupal::service('date.formatter'), 'formatInterval'), array_combine($intervals, $intervals)); diff --git a/core/modules/aggregator/src/FeedForm.php b/core/modules/aggregator/src/FeedForm.php index 35359ce..d84c11e 100644 --- a/core/modules/aggregator/src/FeedForm.php +++ b/core/modules/aggregator/src/FeedForm.php @@ -32,6 +32,25 @@ public function form(array $form, FormStateInterface $form_state) { /** * {@inheritdoc} */ + public function validate(array $form, FormStateInterface $form_state) { + $feed = $this->buildEntity($form, $form_state); + // Check for duplicate titles. + $feed_storage = $this->entityManager->getStorage('aggregator_feed'); + $result = $feed_storage->getFeedDuplicates($feed); + foreach ($result as $item) { + if (strcasecmp($item->label(), $feed->label()) == 0) { + $form_state->setErrorByName('title', $this->t('A feed named %feed already exists. Enter a unique title.', array('%feed' => $feed->label()))); + } + if (strcasecmp($item->getUrl(), $feed->getUrl()) == 0) { + $form_state->setErrorByName('url', $this->t('A feed with this URL %url already exists. Enter a unique URL.', array('%url' => $feed->getUrl()))); + } + } + parent::validate($form, $form_state); + } + + /** + * {@inheritdoc} + */ public function save(array $form, FormStateInterface $form_state) { $feed = $this->entity; $insert = (bool) $feed->id(); diff --git a/core/modules/aggregator/src/Plugin/Validation/Constraint/FeedTitleConstraint.php b/core/modules/aggregator/src/Plugin/Validation/Constraint/FeedTitleConstraint.php deleted file mode 100644 index 47d16ac..0000000 --- a/core/modules/aggregator/src/Plugin/Validation/Constraint/FeedTitleConstraint.php +++ /dev/null @@ -1,31 +0,0 @@ -assertText($feed->label(), 'Page title'); $this->assertRaw($feed->getWebsiteUrl()); - // Try to add a duplicate. - $edit = [ - 'title[0][value]' => $feed->label(), - 'url[0][value]' => $feed->getUrl(), - 'refresh' => '900', - ]; - $this->drupalPostForm('aggregator/sources/add', $edit, t('Save')); - $this->assertRaw(t('A feed named %feed already exists. Enter a unique title.', array('%feed' => $feed->label()))); - $this->assertRaw(t('A feed with this URL %url already exists. Enter a unique URL.', array('%url' => $feed->getUrl()))); - // Delete feed. $this->deleteFeed($feed); } diff --git a/core/modules/aggregator/src/Tests/FeedValidationTest.php b/core/modules/aggregator/src/Tests/FeedValidationTest.php deleted file mode 100644 index 83c01d0..0000000 --- a/core/modules/aggregator/src/Tests/FeedValidationTest.php +++ /dev/null @@ -1,72 +0,0 @@ -installEntitySchema('aggregator_feed'); - } - - /** - * Tests the feed validation constraints. - */ - public function testValidation() { - // Add feed. - $feed = Feed::create([ - 'title' => 'Feed 1', - 'url' => 'http://drupal.org/planet/rss', - 'refresh' => 900, - ]); - - $violations = $feed->validate(); - $this->assertEqual(count($violations), 0); - - $feed->save(); - - // Add another feed. - /* @var \Drupal\aggregator\FeedInterface $feed */ - $feed = Feed::create([ - 'title' => 'Feed 1', - 'url' => 'http://drupal.org/planet/rss', - 'refresh' => 900, - ]); - - $violations = $feed->validate(); - - $this->assertEqual(count($violations), 2); - $this->assertEqual($violations[0]->getPropertyPath(), 'title'); - $this->assertEqual($violations[0]->getMessage(), t('A feed named %value already exists. Enter a unique title.', [ - '%value' => $feed->label(), - ])); - $this->assertEqual($violations[1]->getPropertyPath(), 'url'); - $this->assertEqual($violations[1]->getMessage(), t('A feed with this URL %value already exists. Enter a unique URL.', [ - '%value' => $feed->getUrl(), - ])); - } - -} diff --git a/core/modules/book/templates/book-navigation.html.twig b/core/modules/book/templates/book-navigation.html.twig index 0f12980..f10a4e5 100644 --- a/core/modules/book/templates/book-navigation.html.twig +++ b/core/modules/book/templates/book-navigation.html.twig @@ -31,7 +31,7 @@ */ #} {% if tree or has_links %} -