Skip to content

Commit

Permalink
Merge pull request #73 from MurhafSousli/ng-16
Browse files Browse the repository at this point in the history
v3.0.1
  • Loading branch information
MurhafSousli committed Jul 12, 2023
2 parents eeaafab + ab4f3d5 commit e53c50c
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 22 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 3.0.0
## 3.0.1

- Upgrade to Angular 16

Expand Down
2 changes: 1 addition & 1 deletion projects/ngx-disqus/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ngx-disqus",
"description": "Angular Disqus Module",
"version": "3.0.0",
"version": "3.0.1",
"homepage": "http://github.com/murhafsousli/ngx-disqus",
"author": {
"name": "Murhaf Sousli",
Expand Down
24 changes: 24 additions & 0 deletions projects/ngx-disqus/src/lib/disqus.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { Injectable, Inject } from '@angular/core';
import { DOCUMENT } from '@angular/common';
import { DISQUS_SHORTNAME } from './disqus.model';

@Injectable({
providedIn: 'root'
})
export class DisqusService {

get DISQUS(): any {
return this.document.defaultView['DISQUS'];
}

get config(): any {
return this.document.defaultView['disqus_config'];
}

set config(config: any) {
this.document.defaultView['disqus_config'] = config;
}

constructor(@Inject(DISQUS_SHORTNAME) public shortname: string, @Inject(DOCUMENT) private document: Document) {
}
}
27 changes: 7 additions & 20 deletions projects/ngx-disqus/src/lib/disqus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
Renderer2,
ChangeDetectionStrategy
} from '@angular/core';
import { DOCUMENT } from '@angular/common';
import { DISQUS_SHORTNAME, DisqusComment, DisqusReady } from './disqus.model';
import { DisqusComment, DisqusReady } from './disqus.model';
import { DisqusService } from './disqus.service';

@Component({
standalone: true,
Expand All @@ -20,18 +20,6 @@ import { DISQUS_SHORTNAME, DisqusComment, DisqusReady } from './disqus.model';
})
export class Disqus implements OnChanges {

get DISQUS(): any {
return this.document.defaultView['DISQUS'];
}

get disqusConfig(): any {
return this.document.defaultView['disqus_config'];
}

set disqusConfig(config: any) {
this.document.defaultView['disqus_config'] = config;
}

/** DISQUS options */
@Input() url: string;
@Input() identifier: string;
Expand All @@ -44,15 +32,14 @@ export class Disqus implements OnChanges {
@Output() ready = new EventEmitter<DisqusReady>(true);
@Output() paginate = new EventEmitter<any>(true);

constructor(@Inject(DISQUS_SHORTNAME) private shortname: string,
@Inject(DOCUMENT) private document: Document,
constructor(private disqus: DisqusService,
private renderer: Renderer2,
private el: ElementRef<HTMLElement>) {
}

ngOnChanges(): void {
/** Reset Disqus if any input changed */
if (!this.DISQUS) {
if (!this.disqus.DISQUS) {
this.addDisqusScript();
} else {
this.reset();
Expand All @@ -62,10 +49,10 @@ export class Disqus implements OnChanges {
/** Add DISQUS script */
addDisqusScript(): void {
/** Set DISQUS config */
this.disqusConfig = this.getConfig();
this.disqus.config = this.getConfig();

const disqusScript = this.renderer.createElement('script');
disqusScript.src = `//${this.shortname}.disqus.com/embed.js`;
disqusScript.src = `//${ this.disqus.shortname }.disqus.com/embed.js`;
disqusScript.async = true;
disqusScript.type = 'text/javascript';
this.renderer.setAttribute(disqusScript, 'data-timestamp', new Date().getTime().toString());
Expand All @@ -74,7 +61,7 @@ export class Disqus implements OnChanges {

/** Reset DISQUS with the new config */
reset(): void {
this.DISQUS.reset({
this.disqus.DISQUS.reset({
reload: true,
config: this.getConfig()
});
Expand Down
1 change: 1 addition & 0 deletions projects/ngx-disqus/src/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
*/

export * from './lib/disqus';
export * from './lib/disqus.service';
export * from './lib/disqus.model';
export * from './lib/disqus.module';

0 comments on commit e53c50c

Please sign in to comment.