Revert transition disable function
This commit is contained in:
parent
c4b57e91ab
commit
6e96974364
|
@ -372,8 +372,10 @@ export class MenuComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
public valueChange() {
|
public valueChange() {
|
||||||
|
this.elements.disable();
|
||||||
this.cdr.detectChanges();
|
this.cdr.detectChanges();
|
||||||
this.elements.init();
|
this.elements.init();
|
||||||
|
this.elements.enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
public get displayMenuItems() {
|
public get displayMenuItems() {
|
||||||
|
|
|
@ -222,10 +222,6 @@
|
||||||
[queryParams]="{view: 'RESTRICTED'}"
|
[queryParams]="{view: 'RESTRICTED'}"
|
||||||
(click)="hide(element)">Restricted view</a>
|
(click)="hide(element)">Restricted view</a>
|
||||||
</li>
|
</li>
|
||||||
<!--<li class="disabled"><a class="uk-disabled uk-text-muted"
|
|
||||||
uk-tooltip="Note: available only in administration dashboard"
|
|
||||||
(click)="hide(element)">Private view</a>
|
|
||||||
</li>-->
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -242,18 +242,30 @@ export class TopicComponent extends StakeholderBaseComponent implements OnInit,
|
||||||
}
|
}
|
||||||
|
|
||||||
topicChanged(callback: Function, save: boolean = false) {
|
topicChanged(callback: Function, save: boolean = false) {
|
||||||
|
if(this.topics && save) {
|
||||||
|
this.topics.disable();
|
||||||
|
}
|
||||||
|
if(this.categories) {
|
||||||
|
this.categories.disable();
|
||||||
|
}
|
||||||
|
if(this.subCategories) {
|
||||||
|
this.subCategories.disable();
|
||||||
|
}
|
||||||
if(callback) {
|
if(callback) {
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
this.cdr.detectChanges();
|
this.cdr.detectChanges();
|
||||||
if(this.topics && save) {
|
if(this.topics && save) {
|
||||||
this.topics.init();
|
this.topics.init();
|
||||||
|
this.topics.enable();
|
||||||
}
|
}
|
||||||
if(this.categories) {
|
if(this.categories) {
|
||||||
this.categories.init();
|
this.categories.init();
|
||||||
|
this.categories.enable();
|
||||||
}
|
}
|
||||||
if(this.subCategories) {
|
if(this.subCategories) {
|
||||||
this.subCategories.init();
|
this.subCategories.init();
|
||||||
|
this.subCategories.enable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -378,15 +390,23 @@ export class TopicComponent extends StakeholderBaseComponent implements OnInit,
|
||||||
}
|
}
|
||||||
|
|
||||||
categoryChanged(callback: Function, save: boolean = false) {
|
categoryChanged(callback: Function, save: boolean = false) {
|
||||||
|
if(this.categories && save) {
|
||||||
|
this.categories.disable();
|
||||||
|
}
|
||||||
|
if(this.subCategories) {
|
||||||
|
this.subCategories.disable();
|
||||||
|
}
|
||||||
if(callback) {
|
if(callback) {
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
this.cdr.detectChanges();
|
this.cdr.detectChanges();
|
||||||
if(this.categories && save) {
|
if(this.categories && save) {
|
||||||
this.categories.init();
|
this.categories.init();
|
||||||
|
this.categories.enable();
|
||||||
}
|
}
|
||||||
if(this.subCategories) {
|
if(this.subCategories) {
|
||||||
this.subCategories.init();
|
this.subCategories.init();
|
||||||
|
this.subCategories.enable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -512,12 +532,16 @@ export class TopicComponent extends StakeholderBaseComponent implements OnInit,
|
||||||
}
|
}
|
||||||
|
|
||||||
subCategoryChanged(callback: Function, save: boolean = false) {
|
subCategoryChanged(callback: Function, save: boolean = false) {
|
||||||
|
if(this.subCategories && save) {
|
||||||
|
this.subCategories.disable();
|
||||||
|
}
|
||||||
if(callback) {
|
if(callback) {
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
this.cdr.detectChanges();
|
this.cdr.detectChanges();
|
||||||
if(this.subCategories && save) {
|
if(this.subCategories && save) {
|
||||||
this.subCategories.init();
|
this.subCategories.init();
|
||||||
|
this.subCategories.enable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,13 +30,14 @@ export class TransitionGroupComponent implements AfterViewInit, OnDestroy {
|
||||||
@Input()
|
@Input()
|
||||||
public id: string;
|
public id: string;
|
||||||
public size: number;
|
public size: number;
|
||||||
|
private disabled: boolean = false;
|
||||||
private subscription: Subscription;
|
private subscription: Subscription;
|
||||||
|
|
||||||
constructor(public element: ElementRef) {}
|
constructor(public element: ElementRef) {}
|
||||||
|
|
||||||
ngAfterViewInit() {
|
ngAfterViewInit() {
|
||||||
this.subscription = this.items.changes.subscribe(items => {
|
this.subscription = this.items.changes.subscribe(items => {
|
||||||
if(items.length === this.size) {
|
if(items.length === this.size && !this.disabled) {
|
||||||
items.forEach(item => item.prevPos = item.newPos || item.prevPos);
|
items.forEach(item => item.prevPos = item.newPos || item.prevPos);
|
||||||
items.forEach(this.runCallback);
|
items.forEach(this.runCallback);
|
||||||
this.refreshPosition('newPos');
|
this.refreshPosition('newPos');
|
||||||
|
@ -126,17 +127,17 @@ export class TransitionGroupComponent implements AfterViewInit, OnDestroy {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enable transition
|
* Enable transition
|
||||||
* @deprecated
|
*
|
||||||
* */
|
* */
|
||||||
enable() {
|
enable() {
|
||||||
console.debug('Deprecated')
|
this.disabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disable transition
|
* Disable transition
|
||||||
* @deprecated
|
*
|
||||||
* */
|
* */
|
||||||
disable() {
|
disable() {
|
||||||
console.debug('Deprecated')
|
this.disabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue