Change handlers order in array

anna-zhernovkova · anna-zhernovkova · commit 8df7e3ce2b5b · 2017-08-23T12:42:02.000+03:00
diff --git a/src/core/nested-option.ts b/src/core/nested-option.ts
@@ -145,12 +145,13 @@ export function extractTemplate(option: OptionWithTemplate, element: ElementRef)
     }
 
     function triggerShownEvent($element) {
-        let changeHandlers = $element.find('.' + VISIBILITY_CHANGE_SELECTOR);
+        let changeHandlers = $();
 
         if ($element.hasClass(VISIBILITY_CHANGE_SELECTOR)) {
-            changeHandlers.push($element);
+            changeHandlers = $element;
         }
 
+        changeHandlers = changeHandlers.add($element.find('.' + VISIBILITY_CHANGE_SELECTOR));
 
         for (let i = 0; i < changeHandlers.length; i++) {
             $(changeHandlers[i]).triggerHandler('dxshown');

Original file line number	Diff line number	Diff line change
`@@ -145,12 +145,13 @@ export function extractTemplate(option: OptionWithTemplate, element: ElementRef)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`function triggerShownEvent($element) {`
`148`		`- let changeHandlers = $element.find('.' + VISIBILITY_CHANGE_SELECTOR);`
	`148`	`+ let changeHandlers = $();`
`149`	`149`
`150`	`150`	`if ($element.hasClass(VISIBILITY_CHANGE_SELECTOR)) {`
`151`		`- changeHandlers.push($element);`
	`151`	`+ changeHandlers = $element;`
`152`	`152`	`}`
`153`	`153`
	`154`	`+ changeHandlers = changeHandlers.add($element.find('.' + VISIBILITY_CHANGE_SELECTOR));`
`154`	`155`
`155`	`156`	`for (let i = 0; i < changeHandlers.length; i++) {`
`156`	`157`	`$(changeHandlers[i]).triggerHandler('dxshown');`