Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Update to newest version of prism-element and prism #228

Merged
merged 1 commit into from
Jun 8, 2016
Merged

Conversation

TimvdLippe
Copy link
Contributor

This updates the dependencies to not fail on installation. Also updated to the newest versions to integrate latest changes. Run bower update to fetch the latest versions.

See PrismJS/prism#952
See PolymerElements/prism-element#17

Fixes #57
Fixes #227

@@ -49,9 +48,6 @@
/*global Prism*/
// Match all lines that are not insertions or deletions
Prism.languages.diff.other = /.+/m;
// Additions and deletions can also be an empty line
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intended that empty lines are not coloured anymore?

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to run bower update I think

@eanker
Copy link
Contributor

eanker commented Jun 8, 2016

This works the same as before, except for my question.

Sadly, travis is failing because of firefox.
All tests work locally.

@eanker eanker merged commit e4975a1 into master Jun 8, 2016
@eanker eanker deleted the prism-updates branch June 8, 2016 09:10
@eanker eanker removed the in progress label Jun 8, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants