@magic-xpa/angular 4.800.0-dev480.203 → 4.800.0-dev480.204
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/magic-xpa-angular.umd.js +2 -1
- package/bundles/magic-xpa-angular.umd.js.map +1 -1
- package/bundles/magic-xpa-angular.umd.min.js +1 -1
- package/bundles/magic-xpa-angular.umd.min.js.map +1 -1
- package/esm2015/src/ui/directives/magic/row.magic.directive.js +4 -2
- package/fesm2015/magic-xpa-angular.js +2 -1
- package/fesm2015/magic-xpa-angular.js.map +1 -1
- package/package.json +3 -3
|
@@ -2,6 +2,7 @@ import { Directive, ElementRef, HostListener, Input } from "@angular/core";
|
|
|
2
2
|
import { TaskMagicService } from "../../../services/task.magics.service";
|
|
3
3
|
import { getGuiEventObj } from "@magic-xpa/engine";
|
|
4
4
|
import { filter } from "rxjs/operators";
|
|
5
|
+
import { MagicDirective } from "../../directives/magic.directive";
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
import * as i1 from "../../../services/task.magics.service";
|
|
7
8
|
export class RowMagicDirective {
|
|
@@ -33,7 +34,8 @@ export class RowMagicDirective {
|
|
|
33
34
|
onClick($event) {
|
|
34
35
|
if (this.rowId != '') {
|
|
35
36
|
this._task.insertEvent(getGuiEventObj('click', "magicRow", +this.rowId));
|
|
36
|
-
|
|
37
|
+
if (!MagicDirective.opened)
|
|
38
|
+
event.cancelBubble = true;
|
|
37
39
|
}
|
|
38
40
|
}
|
|
39
41
|
}
|
|
@@ -53,4 +55,4 @@ RowMagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: RowMagicDirective, sele
|
|
|
53
55
|
type: HostListener,
|
|
54
56
|
args: ['click', ['$event']]
|
|
55
57
|
}] }); })();
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm93Lm1hZ2ljLmRpcmVjdGl2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXIvc3JjL3VpL2RpcmVjdGl2ZXMvbWFnaWMvcm93Lm1hZ2ljLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFxQixNQUFNLGVBQWUsQ0FBQztBQUM5RixPQUFPLEVBQUMsZ0JBQWdCLEVBQUMsTUFBTSx1Q0FBdUMsQ0FBQztBQUN2RSxPQUFPLEVBQUMsY0FBYyxFQUFDLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXhDLE9BQU8sRUFBQyxjQUFjLEVBQUMsTUFBTSxrQ0FBa0MsQ0FBQTs7O0FBVS9ELE1BQU0sT0FBTyxpQkFBaUI7SUFhNUIsWUFDWSxLQUF3QixFQUN4QixPQUFtQjtRQURuQixVQUFLLEdBQUwsS0FBSyxDQUFtQjtRQUN4QixZQUFPLEdBQVAsT0FBTyxDQUFZO1FBSnZCLHlCQUFvQixHQUFpQixJQUFJLENBQUM7UUFPaEQsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQztJQUNoRCxDQUFDO0lBS0QsUUFBUTtRQUNOLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxJQUFJLENBQUMsS0FBSzthQUNuQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQzthQUNoRSxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDO2dCQUNsQyxJQUFJLENBQUMsV0FBVyxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQ3RDLENBQUMsQ0FDRixDQUFDO0lBQ04sQ0FBQztJQUVPLFFBQVEsQ0FBQyxPQUFPO1FBQ3RCLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO1FBQzdDLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxhQUFhLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUNqRSxPQUFPLENBQ0wsSUFBSSxDQUFDLEdBQUcsSUFBSSxVQUFVLENBQUMsR0FBRztZQUMxQixJQUFJLENBQUMsTUFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQ2pDLENBQUM7SUFDSixDQUFDO0lBS0QsV0FBVztRQU9ULElBQUksSUFBSSxDQUFDLG9CQUFvQixLQUFLLElBQUksRUFBRTtZQUN0QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxFQUFFLENBQUM7U0FDekM7SUFDSCxDQUFDO0lBR0QsT0FBTyxDQUFDLE1BQU07UUFDWixJQUFHLElBQUksQ0FBQyxLQUFLLElBQUksRUFBRSxFQUFFO1lBQ25CLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDekUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNO2dCQUN4QixLQUFLLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQztTQUM3QjtJQUNILENBQUM7O2tGQWpFVSxpQkFBaUI7c0RBQWpCLGlCQUFpQjtvR0FBakIsbUJBQWU7O29DQUFmLGlCQUFpQjtjQUw1QixTQUFTO2VBQUM7Z0JBQ1QsUUFBUSxFQUFFLFlBQVk7YUFDdkI7NEZBSW1CLEtBQUs7a0JBQXZCLEtBQUs7bUJBQUMsVUFBVTtZQTBEakIsT0FBTztrQkFETixZQUFZO21CQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG5pbXBvcnQgeyBEaXJlY3RpdmUsIEVsZW1lbnRSZWYsIEhvc3RMaXN0ZW5lciwgSW5wdXQsIE9uRGVzdHJveSwgT25Jbml0IH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHtUYXNrTWFnaWNTZXJ2aWNlfSBmcm9tIFwiLi4vLi4vLi4vc2VydmljZXMvdGFzay5tYWdpY3Muc2VydmljZVwiO1xyXG5pbXBvcnQge2dldEd1aUV2ZW50T2JqfSBmcm9tIFwiQG1hZ2ljLXhwYS9lbmdpbmVcIjtcclxuaW1wb3J0IHsgZmlsdGVyIH0gZnJvbSBcInJ4anMvb3BlcmF0b3JzXCI7XHJcbmltcG9ydCB7IFN1YnNjcmlwdGlvbiB9IGZyb20gXCJyeGpzL1J4XCI7XHJcbmltcG9ydCB7TWFnaWNEaXJlY3RpdmV9IGZyb20gXCIuLi8uLi9kaXJlY3RpdmVzL21hZ2ljLmRpcmVjdGl2ZVwiXHJcblxyXG4vKipcclxuICogQGlnbm9yZVxyXG4gKi9cclxuIEBEaXJlY3RpdmUoe1xyXG4gICBzZWxlY3RvcjogJ1ttYWdpY1Jvd10nXHJcbiB9KVxyXG5cclxuXHJcbmV4cG9ydCBjbGFzcyBSb3dNYWdpY0RpcmVjdGl2ZSBpbXBsZW1lbnRzIE9uSW5pdCwgT25EZXN0cm95e1xyXG4gIEBJbnB1dCgnbWFnaWNSb3cnKSByb3dJZDogc3RyaW5nO1xyXG5cclxuICAvKipcclxuICAgKiBUaGUgSFRNTCBlbGVtZW50IGNvbm5lY3RlZCB0byB0aGlzIGRpcmVjdGl2ZVxyXG4gICAqL1xyXG4gIHByb3RlY3RlZCBodG1sRWxlbWVudDogSFRNTEVsZW1lbnQ7XHJcblxyXG4gIC8qKlxyXG4gICAqIEBpZ25vcmVcclxuICAgKi9cclxuICBwcml2YXRlIHJvd0NoYW5nZWRTdWJzY3JpYmVyOiBTdWJzY3JpcHRpb24gPSBudWxsO1xyXG5cclxuICBjb25zdHJ1Y3RvcihcclxuICAgIHByb3RlY3RlZCBfdGFzayA6IFRhc2tNYWdpY1NlcnZpY2UsXHJcbiAgICBwcm90ZWN0ZWQgZWxlbWVudDogRWxlbWVudFJlZlxyXG4gIClcclxuICB7XHJcbiAgICB0aGlzLmh0bWxFbGVtZW50ID0gdGhpcy5lbGVtZW50Lm5hdGl2ZUVsZW1lbnQ7XHJcbiAgfVxyXG5cclxuICAvKipcclxuICAgKiBJbml0aWFsaXplcyB0aGlzIG9iamVjdFxyXG4gICAqL1xyXG4gIG5nT25Jbml0KCk6IHZvaWQge1xyXG4gICAgdGhpcy5yb3dDaGFuZ2VkU3Vic2NyaWJlciA9IHRoaXMuX3Rhc2tcclxuICAgICAgLk9uU2VsZWN0ZWRSb3dDaGFuZ2VkLnBpcGUoZmlsdGVyKHJvd0lkID0+IHJvd0lkID09PSB0aGlzLnJvd0lkKSlcclxuICAgICAgLnN1YnNjcmliZShyb3dJZCA9PiB7XHJcbiAgICAgICAgICBpZiAoIXRoaXMuaXNJblZpZXcodGhpcy5odG1sRWxlbWVudCkpXHJcbiAgICAgICAgICAgIHRoaXMuaHRtbEVsZW1lbnQuc2Nyb2xsSW50b1ZpZXcoKTtcclxuICAgICAgICB9XHJcbiAgICAgICk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGlzSW5WaWV3KGVsZW1lbnQpOiBib29sZWFuIHtcclxuICAgIGNvbnN0IHJlY3QgPSBlbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpO1xyXG4gICAgY29uc3QgcGFyZW50UmVjdCA9IGVsZW1lbnQucGFyZW50RWxlbWVudC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTtcclxuICAgIHJldHVybiAoXHJcbiAgICAgIHJlY3QudG9wID49IHBhcmVudFJlY3QudG9wICYmXHJcbiAgICAgIHJlY3QuYm90dG9tIDw9IHBhcmVudFJlY3QuYm90dG9tXHJcbiAgICApO1xyXG4gIH1cclxuXHJcbiAgLyoqXHJcbiAgICogQ2xlYW51cFxyXG4gICAqL1xyXG4gIG5nT25EZXN0cm95KCkge1xyXG4gICAgLy8gRG9uJ3Qga25vdyB3aHksIGJ1dCB3aGVuIHRoZSB0YWJsZSBpcyBsb2FkZWQgZm9yIHRoZSBmaXJzdCB0aW1lLCB3ZVxyXG4gICAgLy8gZ2V0IG5nT25Jbml0KCkgZm9yIHRoZSAxc3Qgcm93IChyb3dJZCA9IFwiMFwiKSBhbmQgdGhlbiBuZ09uRGVzdHJveSgpXHJcbiAgICAvLyBmb3IgbnVtYmVyIG9mIHJvd3MgaW4gdGhlIHBhZ2UgYnV0IGhlcmUgdGhpcy5yb3dJZCBpcyB1bmRlZmluZWQuXHJcbiAgICAvLyBTaW5jZSBuZ09uSW5pdCgpIHdhcyBub3QgY2FsbGVkIGZvciBhbGwgdGhlc2Ugcm93cywgdGhpcy5yb3dDaGFuZ2VkU3Vic2NyaWJlclxyXG4gICAgLy8gaXMgbnVsbCBhbmQgaGVuY2UgY3Jhc2hlcy5cclxuICAgIC8vIFNvLCB0aGUgY29uZGl0aW9uIHRvIGNoZWNrIG51bGl0eSBpcyBhZGRlZC5cclxuICAgIGlmICh0aGlzLnJvd0NoYW5nZWRTdWJzY3JpYmVyICE9PSBudWxsKSB7XHJcbiAgICAgIHRoaXMucm93Q2hhbmdlZFN1YnNjcmliZXIudW5zdWJzY3JpYmUoKTtcclxuICAgIH1cclxuICB9XHJcblxyXG4gIEBIb3N0TGlzdGVuZXIoJ2NsaWNrJywgWyckZXZlbnQnXSlcclxuICBvbkNsaWNrKCRldmVudCkge1xyXG4gICAgaWYodGhpcy5yb3dJZCAhPSAnJykge1xyXG4gICAgICB0aGlzLl90YXNrLmluc2VydEV2ZW50KGdldEd1aUV2ZW50T2JqKCdjbGljaycsIFwibWFnaWNSb3dcIiwgK3RoaXMucm93SWQpKTtcclxuICAgICAgaWYgKCFNYWdpY0RpcmVjdGl2ZS5vcGVuZWQpXHJcbiAgICAgICAgZXZlbnQuY2FuY2VsQnViYmxlID0gdHJ1ZTtcclxuICAgIH1cclxuICB9XHJcbiB9XHJcbiJdfQ==
|
|
@@ -2632,7 +2632,8 @@ class RowMagicDirective {
|
|
|
2632
2632
|
onClick($event) {
|
|
2633
2633
|
if (this.rowId != '') {
|
|
2634
2634
|
this._task.insertEvent(getGuiEventObj('click', "magicRow", +this.rowId));
|
|
2635
|
-
|
|
2635
|
+
if (!MagicDirective.opened)
|
|
2636
|
+
event.cancelBubble = true;
|
|
2636
2637
|
}
|
|
2637
2638
|
}
|
|
2638
2639
|
}
|