1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2016-05-28 13:31:38 -04:00
parent 0d4419098f
commit abf163fb4a
4 changed files with 30 additions and 20 deletions

View file

@ -1,7 +1,7 @@
{ {
"name": "prism-element", "name": "prism-element",
"description": "Prism.js import and syntax highlighting", "description": "Prism.js import and syntax highlighting",
"version": "1.0.3", "version": "1.0.4",
"authors": [ "authors": [
"The Polymer Project Authors (https://polymer.github.io/AUTHORS.txt)" "The Polymer Project Authors (https://polymer.github.io/AUTHORS.txt)"
], ],
@ -30,13 +30,14 @@
"devDependencies": { "devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0", "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"paper-styles": "PolymerElements/paper-styles#^1.0.0" "paper-styles": "PolymerElements/paper-styles#^1.0.0",
"web-component-tester": "^4.0.0"
}, },
"_release": "1.0.3", "_release": "1.0.4",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.3", "tag": "1.0.4",
"commit": "9de59abd5a8081a253dca5a7066e7be95e34bfbc" "commit": "f5786216574e6ab9ef52434e588d37e9f3785b9e"
}, },
"_source": "git://github.com/PolymerElements/prism-element.git", "_source": "git://github.com/PolymerElements/prism-element.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,11 +1,16 @@
<!-- <!--
This file is autogenerated based on This file is autogenerated based on
https://github.com/PolymerElements/ContributionGuide/blob/master/CONTRIBUTING.md https://github.com/PolymerElements/ContributionGuide/blob/master/CONTRIBUTING.md
If you edit that file, it will get updated everywhere else. If you edit that file, it will get updated everywhere else.
If you edit this file, your changes will get overridden :) If you edit this file, your changes will get overridden :)
You can however override the jsbin link with one that's customized to this
specific element:
jsbin=https://jsbin.com/cagaye/edit?html,output
--> -->
# Polymer Elements # Polymer Elements
## Guide for Contributors ## Guide for Contributors
@ -41,7 +46,7 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag
3. Click the `paper-foo` element. 3. Click the `paper-foo` element.
``` ```
2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [http://jsbin.com/cagaye](http://jsbin.com/cagaye/edit?html,output). 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [https://jsbin.com/cagaye/edit?html,output](https://jsbin.com/cagaye/edit?html,output).
3. **A list of browsers where the problem occurs.** This can be skipped if the problem is the same across all browsers. 3. **A list of browsers where the problem occurs.** This can be skipped if the problem is the same across all browsers.
@ -51,14 +56,14 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag
When submitting pull requests, please provide: When submitting pull requests, please provide:
1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues using the following syntax: 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues in the pull request description using the following syntax:
```markdown ```markdown
(For a single issue) (For a single issue)
Fixes #20 Fixes #20
(For multiple issues) (For multiple issues)
Fixes #32, #40 Fixes #32, fixes #40
``` ```
2. **A succinct description of the design** used to fix any related issues. For example: 2. **A succinct description of the design** used to fix any related issues. For example:

View file

@ -1,7 +1,7 @@
{ {
"name": "prism-element", "name": "prism-element",
"description": "Prism.js import and syntax highlighting", "description": "Prism.js import and syntax highlighting",
"version": "1.0.3", "version": "1.0.4",
"authors": [ "authors": [
"The Polymer Project Authors (https://polymer.github.io/AUTHORS.txt)" "The Polymer Project Authors (https://polymer.github.io/AUTHORS.txt)"
], ],
@ -30,6 +30,7 @@
"devDependencies": { "devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0", "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"paper-styles": "PolymerElements/paper-styles#^1.0.0" "paper-styles": "PolymerElements/paper-styles#^1.0.0",
"web-component-tester": "^4.0.0"
} }
} }

View file

@ -77,15 +77,18 @@ This flow is supported by [`<marked-element>`](https://github.com/PolymerElement
return code.match(/^\s*</) ? Prism.languages.markup : Prism.languages.javascript; return code.match(/^\s*</) ? Prism.languages.markup : Prism.languages.javascript;
} }
if (lang === 'js' || lang.substr(0, 2) === 'es') { if (Prism.languages[lang]) {
return Prism.languages.javascript; return Prism.languages[lang];
} else if (lang === 'css') { }
return Prism.languages.css; switch (lang.substr(0, 2)) {
} else if (lang === 'c') { case 'js':
return Prism.languages.clike; case 'es':
} else { return Prism.languages.javascript;
// The assumption is that you're mostly documenting HTML when in HTML. case 'c':
return Prism.languages.markup; return Prism.languages.clike;
default:
// The assumption is that you're mostly documenting HTML when in HTML.
return Prism.languages.markup;
} }
}, },