Revert "Prevent option change event firing when changes occur in comp…

…onent (#712) (#744)

* Revert "Prevent option change event firing when changes occur in component (#712) (#717)"

This reverts commit 08a40ba.

* Update shippable config

* Fix tests

karma.conf.js

@@ -24,6 +24,9 @@ module.exports = function(config) {
             // RxJs
             { pattern: 'node_modules/rxjs/**/*.+(js|js.map)', included: false, watched: false },
 
+            // tslib
+            { pattern: 'node_modules/tslib/tslib.js', included: false, watched: false },
+
             // Angular 2 itself and the testing library
             { pattern: 'node_modules/@angular/!(compiler-cli|tsc-wrapped)/**/*.+(js|js.map)', included: false, watched: false },
 

karma.systemjs.conf.js

@@ -30,7 +30,8 @@
 
       // other libraries
       'rxjs': 'npm:rxjs',
-      'rxjs/operators': 'npm:rxjs/operators/index.js'
+      'rxjs/operators': 'npm:rxjs/operators/index.js',
+      'tslib': 'npm:tslib/tslib.js'
     },
     packages: {
       app: {

shippable.yml

@@ -28,6 +28,6 @@ build:
     - shippable_retry npm install @angular/core@^5.0.0 @angular/common@^5.0.0 @angular/compiler@^5.0.0 @angular/compiler-cli@^5.0.0 @angular/forms@^5.0.0 @angular/http@^5.0.0 @angular/platform-browser@^5.0.0 @angular/platform-browser-dynamic@^5.0.0 --unsafe-perm
     - gulp build.tests
     - gulp run.tests
-    - shippable_retry npm install rxjs@^6.0.0-0 @angular/core@^6.0.0-0 @angular/common@^6.0.0-0 @angular/compiler@^6.0.0-0 @angular/compiler-cli@^6.0.0-0 @angular/forms@^6.0.0-0 @angular/http@^6.0.0-0 @angular/platform-browser@^6.0.0-0 @angular/platform-browser-dynamic@^6.0.0-0 --unsafe-perm
+    - shippable_retry npm install rxjs@^6.0.0-0 @angular/animations@^6.0.0-0 @angular/core@^6.0.0-0 @angular/common@^6.0.0-0 @angular/compiler@^6.0.0-0 @angular/forms@^6.0.0-0 @angular/http@^6.0.0-0 @angular/platform-browser@^6.0.0-0 @angular/platform-browser-dynamic@^6.0.0-0 @angular/compiler-cli@^6.0.0-0 --unsafe-perm
     - gulp build.tests
     - gulp run.tests

src/core/events-strategy.ts

@@ -93,16 +93,12 @@ let createOnStableSubscription = function(ngZone: NgZone, fireNgEvent: Function)
 
 export class EmitterHelper {
     strategy: NgEventsStrategy;
-    lockedValueChangeEvent = false;
 
     constructor(ngZone: NgZone, public component: DxComponent) {
         this.strategy = new NgEventsStrategy(component, ngZone);
         createOnStableSubscription(ngZone, this.fireNgEvent);
     }
     fireNgEvent(eventName: string, eventArgs: any) {
-        if (this.lockedValueChangeEvent && eventName === 'valueChange') {
-            return;
-        }
         let emitter = this.component[eventName];
         if (emitter) {
             emitter.next(eventArgs && eventArgs[0]);

templates/component.tst

@@ -139,9 +139,7 @@ export class <#= it.className #>Component extends <#= baseClass #> <#? implement
     }
 <#? it.isEditor #>
     writeValue(value: any): void {
-        this.eventHelper.lockedValueChangeEvent = true;
         this.value = value;
-        this.eventHelper.lockedValueChangeEvent = false;
     }
 <#? it.widgetName !== "dxRangeSelector" #>
     setDisabledState(isDisabled: boolean): void {

tests/src/ui/custom-value-accessor-implementation.spec.ts

@@ -78,7 +78,6 @@ describe('DxTextBox value accessor', () => {
 
         expect(instance.option('disabled')).toBe(false);
     }));
-
     it('should change the value', async(() => {
         let fixture = TestBed.createComponent(TestContainerComponent);
         fixture.detectChanges();
@@ -90,7 +89,6 @@ describe('DxTextBox value accessor', () => {
 
         expect(instance.option('value')).toBe('text');
     }));
-
     it('should change touched option', async(() => {
         let fixture = TestBed.createComponent(TestContainerComponent);
         fixture.detectChanges();
@@ -104,23 +102,4 @@ describe('DxTextBox value accessor', () => {
 
         expect(fixture.componentInstance.formControl.touched).toBe(true);
     }));
-
-    it('should not fire valueChanges event when patchValue method is used with emitEvent=false (T614207)', () => {
-        let fixture = TestBed.createComponent(TestContainerComponent);
-        fixture.detectChanges();
-
-        let component = fixture.componentInstance,
-            form = component.form,
-            testSpy = jasmine.createSpy('testSpy');
-
-        form.valueChanges.subscribe(testSpy);
-
-        form.controls['formControl'].patchValue('text', { emitEvent: false });
-        fixture.detectChanges();
-        expect(testSpy).toHaveBeenCalledTimes(0);
-
-        form.controls['formControl'].patchValue('text2');
-        fixture.detectChanges();
-        expect(testSpy).toHaveBeenCalledTimes(1);
-    });
 });