Skip to content

Commit

Permalink
Merge pull request #1223 from NationalBankBelgium/greenkeeper/stark-p…
Browse files Browse the repository at this point in the history
…ackages/@types/prismjs-1.16.0

Greenkeeper/stark packages/@types/prismjs 1.16.0
  • Loading branch information
christophercr committed Mar 27, 2019
2 parents 44bdc31 + dcd9ba6 commit 517df61
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions packages/stark-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/stark-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@angular/material-moment-adapter": "^7.0.0",
"@mdi/angular-material": "^3.3.92",
"@types/nouislider": "^9.0.4",
"@types/prismjs": "^1.9.0",
"@types/prismjs": "^1.16.0",
"angular2-text-mask": "^9.0.0",
"normalize.css": "^8.0.1",
"nouislider": "^13.1.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, ElementRef, Inject, Input, OnChanges, OnInit, Renderer2, SimpleChanges, ViewEncapsulation } from "@angular/core";
/* tslint:disable:no-duplicate-imports no-import-side-effect */
import * as Prism from "prismjs";
import { LanguageDefinition } from "prismjs";
import { Grammar } from "prismjs";
// prism loads these languages by default: "css", "clike", "javascript" and "markup" (which includes "xml", "html", "mathml", "svg")
import "prismjs/components/prism-typescript.min.js";
import "prismjs/components/prism-sql.min.js";
Expand Down Expand Up @@ -134,7 +134,7 @@ export class StarkPrettyPrintComponent extends AbstractStarkUiComponent implemen
this.prettyString = "";

if (this.data && this.data.length > 0) {
let prismGrammar: LanguageDefinition = <any>"";
let prismGrammar: Grammar = <any>"";
let prismClass: string = "";

try {
Expand Down Expand Up @@ -201,7 +201,7 @@ export class StarkPrettyPrintComponent extends AbstractStarkUiComponent implemen
}

if (this.highlightingEnabled) {
this.prettyString = Prism.highlight(this.prettyString, prismGrammar);
this.prettyString = Prism.highlight(this.prettyString, prismGrammar, this.format);
this.prettyString =
"<pre class='" + prismClass + "'><code class='" + prismClass + "'>" + this.prettyString + "</code></pre>";
}
Expand Down

0 comments on commit 517df61

Please sign in to comment.