chore: upgrade bootstrap to 3.4.1 (#928)
* chore: upgrade bootstrap to 3.4.1 * fix: add whitelist to the toolbox sanitizer * fix: remove unnecessary console.log
This commit is contained in:
committed by
László Monda
parent
33c910d70c
commit
264752530f
6
packages/uhk-web/package-lock.json
generated
6
packages/uhk-web/package-lock.json
generated
@@ -1969,9 +1969,9 @@
|
||||
}
|
||||
},
|
||||
"bootstrap": {
|
||||
"version": "3.3.7",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
|
||||
"integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=",
|
||||
"version": "3.4.1",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
|
||||
"integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
|
||||
"dev": true
|
||||
},
|
||||
"brace-expansion": {
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
"angular-confirmation-popover": "4.2.0",
|
||||
"angular-notifier": "4.1.1",
|
||||
"autoprefixer": "^7.2.3",
|
||||
"bootstrap": "3.3.7",
|
||||
"bootstrap": "3.4.1",
|
||||
"codelyzer": "4.5.0",
|
||||
"dragula": "3.7.2",
|
||||
"font-awesome": "4.7.0",
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
import { AfterContentInit, Directive, ElementRef, HostBinding, Input, OnChanges, SimpleChanges } from '@angular/core';
|
||||
import { DomSanitizer } from '@angular/platform-browser';
|
||||
|
||||
const TOOLTIP_SANITAZER_WHITE_LIST = (<any>$.fn).tooltip.Constructor.DEFAULTS.whiteList;
|
||||
TOOLTIP_SANITAZER_WHITE_LIST.div.push('style');
|
||||
|
||||
@Directive({
|
||||
selector: '[data-toggle="tooltip"]'
|
||||
})
|
||||
@@ -39,7 +42,8 @@ export class TooltipDirective implements AfterContentInit, OnChanges {
|
||||
placement: this.placement,
|
||||
html: this.html,
|
||||
template: this.getCustomTemplate(),
|
||||
title: this.title
|
||||
title: this.title,
|
||||
whiteList: TOOLTIP_SANITAZER_WHITE_LIST
|
||||
});
|
||||
|
||||
(<any>jQuery(this.elementRef.nativeElement)
|
||||
|
||||
Reference in New Issue
Block a user