@magic-xpa/angular 4.800.0-dev480.209 → 4.800.0-dev480.212
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 +4 -3
- 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 +2 -2
- package/esm2015/src/ui/directives/magic.directive.js +4 -3
- package/fesm2015/magic-xpa-angular.js +4 -3
- package/fesm2015/magic-xpa-angular.js.map +1 -1
- package/package.json +3 -3
- package/src/ui/directives/magic.directive.d.ts +1 -0
|
@@ -3059,7 +3059,7 @@
|
|
|
3059
3059
|
RowMagicDirective.prototype.onClick = function ($event) {
|
|
3060
3060
|
if (this.rowId != '') {
|
|
3061
3061
|
this._task.insertEvent(engine.getGuiEventObj('click', "magicRow", +this.rowId));
|
|
3062
|
-
if (
|
|
3062
|
+
if (MagicDirective.noOfAutoCompleteBoxesOpened < 1)
|
|
3063
3063
|
event.cancelBubble = true;
|
|
3064
3064
|
}
|
|
3065
3065
|
};
|
|
@@ -3137,7 +3137,7 @@
|
|
|
3137
3137
|
if (_this.htmlElement instanceof HTMLButtonElement)
|
|
3138
3138
|
fromButton = true;
|
|
3139
3139
|
_this.task.insertEvent(engine.getGuiEventObj(event, _this.id, +_this.rowId, fromButton));
|
|
3140
|
-
if (
|
|
3140
|
+
if (MagicDirective.noOfAutoCompleteBoxesOpened < 1)
|
|
3141
3141
|
e.cancelBubble = true;
|
|
3142
3142
|
});
|
|
3143
3143
|
});
|
|
@@ -3178,7 +3178,7 @@
|
|
|
3178
3178
|
(e.keyCode >= gui.GuiConstants.KEY_F1 && e.keyCode <= gui.GuiConstants.KEY_F12);
|
|
3179
3179
|
if (guiEvent.modifiers !== gui.Modifiers.MODIFIER_NONE || supportedKey) {
|
|
3180
3180
|
guiEvent.keyCode = e.keyCode;
|
|
3181
|
-
if (e.keyCode !== gui.GuiConstants.KEY_ESC || e.keyCode === gui.GuiConstants.KEY_ESC && !MagicDirective.opened)
|
|
3181
|
+
if (e.keyCode !== gui.GuiConstants.KEY_ESC || e.keyCode === gui.GuiConstants.KEY_ESC && (!MagicDirective.opened && MagicDirective.noOfAutoCompleteBoxesOpened < 1))
|
|
3182
3182
|
e.cancelBubble = true;
|
|
3183
3183
|
_this.task.insertEvent(guiEvent);
|
|
3184
3184
|
}
|
|
@@ -3275,6 +3275,7 @@
|
|
|
3275
3275
|
return MagicDirective;
|
|
3276
3276
|
}());
|
|
3277
3277
|
MagicDirective.opened = false;
|
|
3278
|
+
MagicDirective.noOfAutoCompleteBoxesOpened = 0;
|
|
3278
3279
|
MagicDirective.ɵfac = function MagicDirective_Factory(t) { return new (t || MagicDirective)(i0.ɵɵdirectiveInject(TaskMagicService), i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i0.Renderer2), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(RowMagicDirective, 8)); };
|
|
3279
3280
|
MagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: MagicDirective, selectors: [["", "magic", ""]], inputs: { magic: "magic", eventsOnly: "eventsOnly", rowId: "rowId" } });
|
|
3280
3281
|
(function () {
|