Merge branch 'master' into hadicharara/added-support-for-rtl-layouts

2022-10-12 08:29:53 -04:00
parent d9155484b4 f3f3edeb00
commit 104ad71ea7
128 changed files with 1242 additions and 1454 deletions
@@ -68,10 +68,8 @@ export function showLayoutMenu (button, currentLayout, views) {
                    cancelable: false
                }));

-                if (!dispatchEvent) {
-                    if (window.$) {
-                        $(button).trigger('layoutchange', [id]);
-                    }
+                if (!dispatchEvent && window.$) {
+                    $(button).trigger('layoutchange', [id]);
                }
            }
        });
@@ -117,7 +115,8 @@ export function getQueryPagingHtml (options) {
        html += '</div>';
    }

-    return html += '</div>';
+    html += '</div>';
+    return html;
 }

 export function showSortMenu (options) {