joachim/homepage
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bootstrap popper error.

Browse Source
This commit is contained in:
Joachim Nielandt 2018-01-02 20:30:21 +01:00
parent 668aa54641
commit 5ed471c1d2
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.angular-cli.json
View File

@ -25,7 +25,6 @@
], ],
"scripts": [ "scripts": [
"../node_modules/jquery/dist/jquery.min.js", "../node_modules/jquery/dist/jquery.min.js",
"../node_modules/bootstrap/dist/js/bootstrap.min.js",
"../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" "../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
], ],
"environmentSource": "environments/environment.ts", "environmentSource": "environments/environment.ts",

4
src/app/components/post/post.component.ts
View File

@ -16,8 +16,8 @@ export class PostComponent implements OnInit {
ngOnInit() { ngOnInit() {
//TODO load the relevant HTML file! //TODO load the relevant HTML file!
console.log('post component has inited: '+this.post.id); // console.log('post component has inited: '+this.post.id);
console.log(this.post); // console.log(this.post);
this.dataloaderService.getPost(this.post.type, this.post.id).subscribe(content=>{ this.dataloaderService.getPost(this.post.type, this.post.id).subscribe(content=>{
this.htmlContainer.nativeElement.innerHTML = content; this.htmlContainer.nativeElement.innerHTML = content;

12
src/app/services/dataloader.service.ts
View File

@ -17,15 +17,15 @@ export class DataloaderService {
//fill it up //fill it up
for(var index in posts) { for(var index in posts) {
let post:any = posts[index]; let post:any = posts[index];
console.log('got this key: '+post); // console.log('got this key: '+post);
console.log(post); // console.log(post);
let temp:Post = new Post(post.post.id); let temp:Post = new Post(post.post.id);
temp.title = post.post.title; temp.title = post.post.title;
temp.type = post.type; temp.type = post.type;
res.push(temp); res.push(temp);
} }
console.log('these are the posts...'); // console.log('these are the posts...');
console.log(res); // console.log(res);
return res; return res;
}); });
} }
@ -39,9 +39,9 @@ export class DataloaderService {
headers: new HttpHeaders({ 'Content-Type': 'text/html', 'Accept':'text/html' }) headers: new HttpHeaders({ 'Content-Type': 'text/html', 'Accept':'text/html' })
}; };
console.log('launching GET'); // console.log('launching GET');
let url = "assets/post/"+type+"/"+id+"/full.html"; let url = "assets/post/"+type+"/"+id+"/full.html";
console.log('fetching: '+url); // console.log('fetching: '+url);
return this.http.get(url, {responseType: 'text'}); return this.http.get(url, {responseType: 'text'});
} }