asap-feed-beta 12.7.6 → 12.7.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/asap-feed-beta.umd.js +9 -11
- package/bundles/asap-feed-beta.umd.js.map +1 -1
- package/bundles/asap-feed-beta.umd.min.js +1 -1
- package/bundles/asap-feed-beta.umd.min.js.map +1 -1
- package/esm2015/lib/tab-feed/asap-tab-feed.component.js +10 -12
- package/esm5/lib/tab-feed/asap-tab-feed.component.js +10 -12
- package/fesm2015/asap-feed-beta.js +9 -11
- package/fesm2015/asap-feed-beta.js.map +1 -1
- package/fesm5/asap-feed-beta.js +9 -11
- package/fesm5/asap-feed-beta.js.map +1 -1
- package/package.json +1 -1
|
@@ -31,19 +31,17 @@ export class AsapTabFeedComponent {
|
|
|
31
31
|
*/
|
|
32
32
|
ngOnChanges(changes) {
|
|
33
33
|
if (changes.settings && this.settings) {
|
|
34
|
-
if (this.settings.tabs.
|
|
34
|
+
if (this.settings.tabs.allFeed) {
|
|
35
|
+
this.feedLoad(this.settings.tabs.allFeed);
|
|
36
|
+
}
|
|
37
|
+
else if (this.settings.tabs.channel_list.length) {
|
|
35
38
|
this.feedLoad(this.settings.tabs.channel);
|
|
36
39
|
}
|
|
37
|
-
else {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
this.feedLoad(this.settings.tabs.feed_users);
|
|
43
|
-
}
|
|
44
|
-
else if (this.settings.tabs.allFeed) {
|
|
45
|
-
this.feedLoad(this.settings.tabs.allFeed);
|
|
46
|
-
}
|
|
40
|
+
else if (this.settings.tabs.feed) {
|
|
41
|
+
this.feedLoad(this.settings.tabs.feed);
|
|
42
|
+
}
|
|
43
|
+
else if (this.settings.tabs.feed_users) {
|
|
44
|
+
this.feedLoad(this.settings.tabs.feed_users);
|
|
47
45
|
}
|
|
48
46
|
}
|
|
49
47
|
}
|
|
@@ -146,4 +144,4 @@ if (false) {
|
|
|
146
144
|
/** @type {?} */
|
|
147
145
|
AsapTabFeedComponent.prototype.service;
|
|
148
146
|
}
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNhcC10YWItZmVlZC5jb21wb25lbnQuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9hc2FwLWZlZWQtYmV0YS8iLCJzb3VyY2VzIjpbImxpYi90YWItZmVlZC9hc2FwLXRhYi1mZWVkLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFvQyxTQUFTLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDaEUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNuQyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQU9wRSxNQUFNLE9BQU8sb0JBQW9COzs7OztJQVEvQixZQUNTLE1BQWMsRUFDZCxPQUE0QjtRQUQ1QixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsWUFBTyxHQUFQLE9BQU8sQ0FBcUI7UUFKOUIsWUFBTyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBTWxCLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7Ozs7SUFFRCxRQUFRO1FBQ04sSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO1FBQ2pDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQztJQUMvQixDQUFDOzs7OztJQUVELFdBQVcsQ0FBQyxPQUFzQjtRQUNoQyxJQUFJLE9BQU8sQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNyQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRTtnQkFDOUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQzthQUMzQztpQkFBTSxJQUFJ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RTlDOzs7O1lBUFEsTUFBTTtZQUROLG1CQUFtQjs7O21CQVd6QixTQUFTLFNBQUMsTUFBTSxFQUFFLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRTt1QkFFbkMsS0FBSzs7OztJQUZOLG9DQUFtRTs7SUFFbkUsd0NBQXVCOztJQUV2Qix1Q0FBb0I7O0lBR2xCLHNDQUFxQjs7SUFDckIsdUNBQW1DIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBJbnB1dCwgT25DaGFuZ2VzLCBPbkluaXQsIFNpbXBsZUNoYW5nZXMsIFZpZXdDaGlsZCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQXNhcEZlZWRCZXRhU2VydmljZSB9IGZyb20gJy4uL2FzYXAtZmVlZC1iZXRhLnNlcnZpY2UnO1xuaW1wb3J0IHsgR2xvYmFsIH0gZnJvbSAnYXNhcC1jcnVkJztcbmltcG9ydCB7IEFzYXBGZWVkQmV0YUNvbXBvbmVudCB9IGZyb20gJy4uL2FzYXAtZmVlZC1iZXRhLmNvbXBvbmVudCc7XG5cbkBDb21wb25lbnQoe1xuICBzZWxlY3RvcjogJ2FzYXAtdGFiLWZlZWQnLFxuICB0ZW1wbGF0ZVVybDogJy4vYXNhcC10YWItZmVlZC5jb21wb25lbnQuaHRtbCcsXG4gIHN0eWxlVXJsczogWycuL2FzYXAtdGFiLWZlZWQuY29tcG9uZW50LnNjc3MnXVxufSlcbmV4cG9ydCBjbGFzcyBBc2FwVGFiRmVlZENvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCwgT25DaGFuZ2VzIHtcblxuICBAVmlld0NoaWxkKCdmZWVkJywgeyBzdGF0aWM6IGZhbHNlIH0pIGZlZWQhOiBBc2FwRmVlZEJldGFDb21wb25lbnQ7XG5cbiAgQElucHV0KCkgc2V0dGluZ3M6IGFueTtcblxuICBwdWJsaWMgY2FuU2hvdyA9IC0xO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHB1YmxpYyBnbG9iYWw6IEdsb2JhbCxcbiAgICBwdWJsaWMgc2VydmljZTogQXNhcEZlZWRCZXRhU2VydmljZVxuICApIHtcbiAgICBjb25zb2xlLmxvZyhcIltBc2FwVGFiRmVlZENvbXBvbmVudF1cIiwgdGhpcy5zZXR0aW5ncyk7XG4gIH1cblxuICBuZ09uSW5pdCgpIHtcbiAgICB0aGlzLnNlcnZpY2UucHVibGljYXRpb24gPSBmYWxzZTtcbiAgICB0aGlzLnNlcnZpY2Uuc3RvcmllcyA9IGZhbHNlO1xuICB9XG5cbiAgbmdPbkNoYW5nZXMoY2hhbmdlczogU2ltcGxlQ2hhbmdlcyk6IHZvaWQge1xuICAgIGlmIChjaGFuZ2VzLnNldHRpbmdzICYmIHRoaXMuc2V0dGluZ3MpIHtcbiAgICAgIGlmICh0aGlzLnNldHRpbmdzLnRhYnMuYWxsRmVlZCkge1xuICAgICAgICB0aGlzLmZlZWRMb2FkKHRoaXMuc2V0dGluZ3MudGFicy5hbGxGZWVkKTtcbiAgICAgIH0gZWxzZSBpZiAodGhpcy5zZXR0aW5ncy50YWJzLmNoYW5uZWxfbGlzdC5sZW5ndGgpIHtcbiAgICAgICAgdGhpcy5mZWVkTG9hZCh0aGlzLnNldHRpbmdzLnRhYnMuY2hhbm5lbCk7XG4gICAgICB9IGVsc2UgaWYgKHRoaXMuc2V0dGluZ3MudGFicy5mZWVkKSB7XG4gICAgICAgIHRoaXMuZmVlZExvYWQodGhpcy5zZXR0aW5ncy50YWJzLmZlZWQpO1xuICAgICAgfSBlbHNlIGlmICh0aGlzLnNldHRpbmdzLnRhYnMuZmVlZF91c2Vycykge1xuICAgICAgICB0aGlzLmZlZWRMb2FkKHRoaXMuc2V0dGluZ3MudGFicy5mZWVkX3VzZXJzKTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICBwdWJsaWMgb25DaGFuZ2VUYWIoZXZlbnQ6IGFueSkge1xuICAgIHRoaXMuZmVlZExvYWQoZXZlbnQudGFiLnRleHRMYWJlbCk7XG4gIH1cblxuICBwdWJsaWMgZmVlZExvYWQodGFiTmFtZTogc3RyaW5nKSB7XG4gICAgdGhpcy5jYW5TaG93ID0gLTE7XG4gICAgaWYgKHRhYk5hbWUgPT0gdGhpcy5zZXR0aW5ncy50YWJzLmNoYW5uZWwpIHtcbiAgICAgIHNldFRpbWVvdXQoKCkgPT4ge1xuICAgICAgICB0aGlzLnNlcnZpY2UucXVlcnkgPSB7XG4gICAgICAgICAgc2VhcmNoQnk6ICdjaGFubmVsX2lkJyxcbiAgICAgICAgICBzZWFyY2hWYWx1ZTogdGhpcy5zZXR0aW5ncy50YWJzLmNoYW5uZWxfbGlzdC5tYXAoYyA9PiBjLmNoYW5uZWxfaWQpLmpvaW4oJywnKVxuICAgICAgICB9XG4gICAgICAgIHRoaXMuY2FuU2hvdyA9IDA7XG4gICAgICB9LCAxMDApO1xuICAgIH1cbiAgICBpZiAodGFiTmFtZSA9PSB0aGlzLnNldHRpbmdzLnRhYnMuZmVlZCkge1xuICAgICAgc2V0VGltZW91dCgoKSA9PiB7XG4gICAgICAgIHRoaXMuc2VydmljZS5xdWVyeSA9IHtcbiAgICAgICAgICBzZWFyY2hCeTogJ3VzZXJfaW5mby5pZCcsXG4gICAgICAgICAgc2VhcmNoVmFsdWU6IHRoaXMuZ2xvYmFsLmxvZ2dlZFVzZXIoKS5pZCxcbiAgICAgICAgICB0eXBlVmFsdWU6ICdudW1iZXInXG4gICAgICAgIH1cbiAgICAgICAgdGhpcy5jYW5TaG93ID0gMTtcbiAgICAgIH0sIDEwMCk7XG4gICAgfVxuICAgIGlmICh0YWJOYW1lID09IHRoaXMuc2V0dGluZ3MudGFicy5mZWVkX3VzZXJzKSB7XG4gICAgICBzZXRUaW1lb3V0KCgpID0+IHtcbiAgICAgICAgdGhpcy5zZXJ2aWNlLnF1ZXJ5ID0ge1xuICAgICAgICAgIHNlYXJjaEJ5OiAndXNlcl9pbmZvLmlkJyxcbiAgICAgICAgICBzZWFyY2hWYWx1ZTogJ2FsbCdcbiAgICAgICAgfVxuICAgICAgICB0aGlzLmNhblNob3cgPSAyO1xuICAgICAgfSwgMTAwKTtcbiAgICB9XG4gICAgaWYgKHRhYk5hbWUgPT0gdGhpcy5zZXR0aW5ncy50YWJzLmFsbEZlZWQpIHtcbiAgICAgIHNldFRpbWVvdXQoKCkgPT4ge1xuICAgICAgICB0aGlzLnNlcnZpY2UucXVlcnkgPSB7fVxuICAgICAgICB0aGlzLmNhblNob3cgPSAzO1xuICAgICAgfSwgMTAwKTtcbiAgICB9XG4gIH1cblxuICBwdWJsaWMgb25OZXdGZWVkKGlkOiBhbnkpIHtcblxuICB9XG5cbn1cbiJdfQ==
|
|
@@ -34,19 +34,17 @@ var AsapTabFeedComponent = /** @class */ (function () {
|
|
|
34
34
|
*/
|
|
35
35
|
function (changes) {
|
|
36
36
|
if (changes.settings && this.settings) {
|
|
37
|
-
if (this.settings.tabs.
|
|
37
|
+
if (this.settings.tabs.allFeed) {
|
|
38
|
+
this.feedLoad(this.settings.tabs.allFeed);
|
|
39
|
+
}
|
|
40
|
+
else if (this.settings.tabs.channel_list.length) {
|
|
38
41
|
this.feedLoad(this.settings.tabs.channel);
|
|
39
42
|
}
|
|
40
|
-
else {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
this.feedLoad(this.settings.tabs.feed_users);
|
|
46
|
-
}
|
|
47
|
-
else if (this.settings.tabs.allFeed) {
|
|
48
|
-
this.feedLoad(this.settings.tabs.allFeed);
|
|
49
|
-
}
|
|
43
|
+
else if (this.settings.tabs.feed) {
|
|
44
|
+
this.feedLoad(this.settings.tabs.feed);
|
|
45
|
+
}
|
|
46
|
+
else if (this.settings.tabs.feed_users) {
|
|
47
|
+
this.feedLoad(this.settings.tabs.feed_users);
|
|
50
48
|
}
|
|
51
49
|
}
|
|
52
50
|
};
|
|
@@ -164,4 +162,4 @@ if (false) {
|
|
|
164
162
|
/** @type {?} */
|
|
165
163
|
AsapTabFeedComponent.prototype.service;
|
|
166
164
|
}
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
165
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNhcC10YWItZmVlZC5jb21wb25lbnQuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9hc2FwLWZlZWQtYmV0YS8iLCJzb3VyY2VzIjpbImxpYi90YWItZmVlZC9hc2FwLXRhYi1mZWVkLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFvQyxTQUFTLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDaEUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNuQyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVwRTtJQWFFLDhCQUNTLE1BQWMsRUFDZCxPQUE0QjtRQUQ1QixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsWUFBTyxHQUFQLE9BQU8sQ0FBcUI7UUFKOUIsWUFBTyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBTWxCLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7Ozs7SUFFRCx1Q0FBUTs7O0lBQVI7UUFDRSxJQUFJLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUM7UUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsS0FBSyxDQUFDO0lBQy9CLENBQUM7Ozs7O0lBRUQsMENBQVc7Ozs7SUFBWCxVQUFZLE9BQXNCO1FBQ2hDLElBQUksT0FBTyxDQUFDLFFBQVEsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ3JDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFO2dCQUM5QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2FBQzNDO2lCQUFNLElBQUksSUFB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ZytDQUE2Qzs7aUJBRTlDOzs7O2dCQVBRLE1BQU07Z0JBRE4sbUJBQW1COzs7dUJBV3pCLFNBQVMsU0FBQyxNQUFNLEVBQUUsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFOzJCQUVuQyxLQUFLOztJQTRFUiwyQkFBQztDQUFBLEFBckZELElBcUZDO1NBaEZZLG9CQUFvQjs7O0lBRS9CLG9DQUFtRTs7SUFFbkUsd0NBQXVCOztJQUV2Qix1Q0FBb0I7O0lBR2xCLHNDQUFxQjs7SUFDckIsdUNBQW1DIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBJbnB1dCwgT25DaGFuZ2VzLCBPbkluaXQsIFNpbXBsZUNoYW5nZXMsIFZpZXdDaGlsZCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQXNhcEZlZWRCZXRhU2VydmljZSB9IGZyb20gJy4uL2FzYXAtZmVlZC1iZXRhLnNlcnZpY2UnO1xuaW1wb3J0IHsgR2xvYmFsIH0gZnJvbSAnYXNhcC1jcnVkJztcbmltcG9ydCB7IEFzYXBGZWVkQmV0YUNvbXBvbmVudCB9IGZyb20gJy4uL2FzYXAtZmVlZC1iZXRhLmNvbXBvbmVudCc7XG5cbkBDb21wb25lbnQoe1xuICBzZWxlY3RvcjogJ2FzYXAtdGFiLWZlZWQnLFxuICB0ZW1wbGF0ZVVybDogJy4vYXNhcC10YWItZmVlZC5jb21wb25lbnQuaHRtbCcsXG4gIHN0eWxlVXJsczogWycuL2FzYXAtdGFiLWZlZWQuY29tcG9uZW50LnNjc3MnXVxufSlcbmV4cG9ydCBjbGFzcyBBc2FwVGFiRmVlZENvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCwgT25DaGFuZ2VzIHtcblxuICBAVmlld0NoaWxkKCdmZWVkJywgeyBzdGF0aWM6IGZhbHNlIH0pIGZlZWQhOiBBc2FwRmVlZEJldGFDb21wb25lbnQ7XG5cbiAgQElucHV0KCkgc2V0dGluZ3M6IGFueTtcblxuICBwdWJsaWMgY2FuU2hvdyA9IC0xO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHB1YmxpYyBnbG9iYWw6IEdsb2JhbCxcbiAgICBwdWJsaWMgc2VydmljZTogQXNhcEZlZWRCZXRhU2VydmljZVxuICApIHtcbiAgICBjb25zb2xlLmxvZyhcIltBc2FwVGFiRmVlZENvbXBvbmVudF1cIiwgdGhpcy5zZXR0aW5ncyk7XG4gIH1cblxuICBuZ09uSW5pdCgpIHtcbiAgICB0aGlzLnNlcnZpY2UucHVibGljYXRpb24gPSBmYWxzZTtcbiAgICB0aGlzLnNlcnZpY2Uuc3RvcmllcyA9IGZhbHNlO1xuICB9XG5cbiAgbmdPbkNoYW5nZXMoY2hhbmdlczogU2ltcGxlQ2hhbmdlcyk6IHZvaWQge1xuICAgIGlmIChjaGFuZ2VzLnNldHRpbmdzICYmIHRoaXMuc2V0dGluZ3MpIHtcbiAgICAgIGlmICh0aGlzLnNldHRpbmdzLnRhYnMuYWxsRmVlZCkge1xuICAgICAgICB0aGlzLmZlZWRMb2FkKHRoaXMuc2V0dGluZ3MudGFicy5hbGxGZWVkKTtcbiAgICAgIH0gZWxzZSBpZiAodGhpcy5zZXR0aW5ncy50YWJzLmNoYW5uZWxfbGlzdC5sZW5ndGgpIHtcbiAgICAgICAgdGhpcy5mZWVkTG9hZCh0aGlzLnNldHRpbmdzLnRhYnMuY2hhbm5lbCk7XG4gICAgICB9IGVsc2UgaWYgKHRoaXMuc2V0dGluZ3MudGFicy5mZWVkKSB7XG4gICAgICAgIHRoaXMuZmVlZExvYWQodGhpcy5zZXR0aW5ncy50YWJzLmZlZWQpO1xuICAgICAgfSBlbHNlIGlmICh0aGlzLnNldHRpbmdzLnRhYnMuZmVlZF91c2Vycykge1xuICAgICAgICB0aGlzLmZlZWRMb2FkKHRoaXMuc2V0dGluZ3MudGFicy5mZWVkX3VzZXJzKTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICBwdWJsaWMgb25DaGFuZ2VUYWIoZXZlbnQ6IGFueSkge1xuICAgIHRoaXMuZmVlZExvYWQoZXZlbnQudGFiLnRleHRMYWJlbCk7XG4gIH1cblxuICBwdWJsaWMgZmVlZExvYWQodGFiTmFtZTogc3RyaW5nKSB7XG4gICAgdGhpcy5jYW5TaG93ID0gLTE7XG4gICAgaWYgKHRhYk5hbWUgPT0gdGhpcy5zZXR0aW5ncy50YWJzLmNoYW5uZWwpIHtcbiAgICAgIHNldFRpbWVvdXQoKCkgPT4ge1xuICAgICAgICB0aGlzLnNlcnZpY2UucXVlcnkgPSB7XG4gICAgICAgICAgc2VhcmNoQnk6ICdjaGFubmVsX2lkJyxcbiAgICAgICAgICBzZWFyY2hWYWx1ZTogdGhpcy5zZXR0aW5ncy50YWJzLmNoYW5uZWxfbGlzdC5tYXAoYyA9PiBjLmNoYW5uZWxfaWQpLmpvaW4oJywnKVxuICAgICAgICB9XG4gICAgICAgIHRoaXMuY2FuU2hvdyA9IDA7XG4gICAgICB9LCAxMDApO1xuICAgIH1cbiAgICBpZiAodGFiTmFtZSA9PSB0aGlzLnNldHRpbmdzLnRhYnMuZmVlZCkge1xuICAgICAgc2V0VGltZW91dCgoKSA9PiB7XG4gICAgICAgIHRoaXMuc2VydmljZS5xdWVyeSA9IHtcbiAgICAgICAgICBzZWFyY2hCeTogJ3VzZXJfaW5mby5pZCcsXG4gICAgICAgICAgc2VhcmNoVmFsdWU6IHRoaXMuZ2xvYmFsLmxvZ2dlZFVzZXIoKS5pZCxcbiAgICAgICAgICB0eXBlVmFsdWU6ICdudW1iZXInXG4gICAgICAgIH1cbiAgICAgICAgdGhpcy5jYW5TaG93ID0gMTtcbiAgICAgIH0sIDEwMCk7XG4gICAgfVxuICAgIGlmICh0YWJOYW1lID09IHRoaXMuc2V0dGluZ3MudGFicy5mZWVkX3VzZXJzKSB7XG4gICAgICBzZXRUaW1lb3V0KCgpID0+IHtcbiAgICAgICAgdGhpcy5zZXJ2aWNlLnF1ZXJ5ID0ge1xuICAgICAgICAgIHNlYXJjaEJ5OiAndXNlcl9pbmZvLmlkJyxcbiAgICAgICAgICBzZWFyY2hWYWx1ZTogJ2FsbCdcbiAgICAgICAgfVxuICAgICAgICB0aGlzLmNhblNob3cgPSAyO1xuICAgICAgfSwgMTAwKTtcbiAgICB9XG4gICAgaWYgKHRhYk5hbWUgPT0gdGhpcy5zZXR0aW5ncy50YWJzLmFsbEZlZWQpIHtcbiAgICAgIHNldFRpbWVvdXQoKCkgPT4ge1xuICAgICAgICB0aGlzLnNlcnZpY2UucXVlcnkgPSB7fVxuICAgICAgICB0aGlzLmNhblNob3cgPSAzO1xuICAgICAgfSwgMTAwKTtcbiAgICB9XG4gIH1cblxuICBwdWJsaWMgb25OZXdGZWVkKGlkOiBhbnkpIHtcblxuICB9XG5cbn1cbiJdfQ==
|
|
@@ -701,19 +701,17 @@ class AsapTabFeedComponent {
|
|
|
701
701
|
*/
|
|
702
702
|
ngOnChanges(changes) {
|
|
703
703
|
if (changes.settings && this.settings) {
|
|
704
|
-
if (this.settings.tabs.
|
|
704
|
+
if (this.settings.tabs.allFeed) {
|
|
705
|
+
this.feedLoad(this.settings.tabs.allFeed);
|
|
706
|
+
}
|
|
707
|
+
else if (this.settings.tabs.channel_list.length) {
|
|
705
708
|
this.feedLoad(this.settings.tabs.channel);
|
|
706
709
|
}
|
|
707
|
-
else {
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
this.feedLoad(this.settings.tabs.feed_users);
|
|
713
|
-
}
|
|
714
|
-
else if (this.settings.tabs.allFeed) {
|
|
715
|
-
this.feedLoad(this.settings.tabs.allFeed);
|
|
716
|
-
}
|
|
710
|
+
else if (this.settings.tabs.feed) {
|
|
711
|
+
this.feedLoad(this.settings.tabs.feed);
|
|
712
|
+
}
|
|
713
|
+
else if (this.settings.tabs.feed_users) {
|
|
714
|
+
this.feedLoad(this.settings.tabs.feed_users);
|
|
717
715
|
}
|
|
718
716
|
}
|
|
719
717
|
}
|