From 1b09d1aadf3f616b572b550be57f30cbf4ba54d9 Mon Sep 17 00:00:00 2001 From: Axel Peter Date: Mon, 14 Jan 2019 13:40:52 +0100 Subject: [PATCH 1/5] fix: fix method --- packages/oui-field/src/field.controller.js | 2 +- packages/oui-popover/src/popover.controller.js | 2 +- packages/oui-select-picker/src/select-picker.controller.js | 2 +- packages/oui-select/src/select.controller.js | 2 +- packages/oui-slideshow/src/slideshow.controller.js | 2 +- packages/oui-textarea/src/textarea.controller.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/oui-field/src/field.controller.js b/packages/oui-field/src/field.controller.js index 4d1fd7e2..c8216eb6 100644 --- a/packages/oui-field/src/field.controller.js +++ b/packages/oui-field/src/field.controller.js @@ -106,7 +106,7 @@ export default class FieldController { }); } - $destroy () { + $onDestroy () { Object.keys(this.controls).forEach(name => { const namedControls = this.controls[name]; namedControls.forEach(control => { diff --git a/packages/oui-popover/src/popover.controller.js b/packages/oui-popover/src/popover.controller.js index c7624775..9d7230e5 100644 --- a/packages/oui-popover/src/popover.controller.js +++ b/packages/oui-popover/src/popover.controller.js @@ -35,7 +35,7 @@ export default class PopoverController { this.setTrigger(); } - $destroy () { + $onDestroy () { this.closePopover(); } diff --git a/packages/oui-select-picker/src/select-picker.controller.js b/packages/oui-select-picker/src/select-picker.controller.js index 38554d6d..e3ad799c 100644 --- a/packages/oui-select-picker/src/select-picker.controller.js +++ b/packages/oui-select-picker/src/select-picker.controller.js @@ -68,7 +68,7 @@ export default class SelectPickerController { }); } - $destroy () { + $onDestroy () { this.labelElement.off("click"); } diff --git a/packages/oui-select/src/select.controller.js b/packages/oui-select/src/select.controller.js index 84f980f8..d3405c22 100644 --- a/packages/oui-select/src/select.controller.js +++ b/packages/oui-select/src/select.controller.js @@ -46,7 +46,7 @@ export default class { this.unregisterFocus = this.$scope.$on("oui:focus", () => this.$select.setFocus()); } - $destroy () { + $onDestroy () { if (this.unregisterFocus) { this.unregisterFocus(); } diff --git a/packages/oui-slideshow/src/slideshow.controller.js b/packages/oui-slideshow/src/slideshow.controller.js index 3b67c32e..ab99f162 100644 --- a/packages/oui-slideshow/src/slideshow.controller.js +++ b/packages/oui-slideshow/src/slideshow.controller.js @@ -62,7 +62,7 @@ export default class { }); } - $destroy () { + $onDestroy () { this.closeOnBoarding(); } diff --git a/packages/oui-textarea/src/textarea.controller.js b/packages/oui-textarea/src/textarea.controller.js index 91f4a2ba..20eaf086 100644 --- a/packages/oui-textarea/src/textarea.controller.js +++ b/packages/oui-textarea/src/textarea.controller.js @@ -54,7 +54,7 @@ export default class { } } - $destroy () { + $onDestroy () { this.$footer.off("click"); } From 809071984e97895bf4314e429336e86311969fe7 Mon Sep 17 00:00:00 2001 From: Axel Peter Date: Mon, 14 Jan 2019 14:20:57 +0100 Subject: [PATCH 2/5] style: add checks in --- packages/oui-field/src/field.controller.js | 8 ++++---- .../oui-select-picker/src/select-picker.controller.js | 4 +++- packages/oui-textarea/src/textarea.controller.js | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/oui-field/src/field.controller.js b/packages/oui-field/src/field.controller.js index c8216eb6..e11dac85 100644 --- a/packages/oui-field/src/field.controller.js +++ b/packages/oui-field/src/field.controller.js @@ -90,8 +90,8 @@ export default class FieldController { }); // Handle click on label to set focus on form element. - this.label = angular.element(this.$element[0].querySelector(LABEL_SELECTOR)); - this.label.on("click", () => { + this.labelElement = angular.element(this.$element[0].querySelector(LABEL_SELECTOR)); + this.labelElement.on("click", () => { this.$scope.$broadcast("oui:focus"); }); @@ -115,8 +115,8 @@ export default class FieldController { }); }); - if (this.label) { - this.label.off("click"); + if (this.labelElement) { + this.labelElement.off("click"); } } diff --git a/packages/oui-select-picker/src/select-picker.controller.js b/packages/oui-select-picker/src/select-picker.controller.js index e3ad799c..dd75838f 100644 --- a/packages/oui-select-picker/src/select-picker.controller.js +++ b/packages/oui-select-picker/src/select-picker.controller.js @@ -69,7 +69,9 @@ export default class SelectPickerController { } $onDestroy () { - this.labelElement.off("click"); + if (this.labelElement) { + this.labelElement.off("click"); + } } getFirstValueMatch (path) { diff --git a/packages/oui-textarea/src/textarea.controller.js b/packages/oui-textarea/src/textarea.controller.js index 20eaf086..ab010a7e 100644 --- a/packages/oui-textarea/src/textarea.controller.js +++ b/packages/oui-textarea/src/textarea.controller.js @@ -55,7 +55,9 @@ export default class { } $onDestroy () { - this.$footer.off("click"); + if (this.$footer) { + this.$footer.off("click"); + } } onTextareaChange () { From 0fbc80cd11371e9a99113ea1d33cae3e80b4addc Mon Sep 17 00:00:00 2001 From: lizardK Date: Mon, 21 Jan 2019 16:48:43 +0100 Subject: [PATCH 3/5] fix(oui-select-picker): fix svg support for picture attribute (#350) --- packages/oui-select-picker/src/select-picker.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oui-select-picker/src/select-picker.controller.js b/packages/oui-select-picker/src/select-picker.controller.js index dd75838f..24096615 100644 --- a/packages/oui-select-picker/src/select-picker.controller.js +++ b/packages/oui-select-picker/src/select-picker.controller.js @@ -27,7 +27,7 @@ export default class SelectPickerController { } if (this.picture) { - this.isImgPath = /^data:/.test(this.picture) || /\.(gif|png|jpg)$/.test(this.picture); + this.isImgPath = /^data:/.test(this.picture) || /\.(gif|png|jpg|svg)$/.test(this.picture); } if (this.values) { From 8e2ddcea6392424b5631863bc5ed4fe3af34c0ff Mon Sep 17 00:00:00 2001 From: Joffrey LEVEUGLE Date: Mon, 21 Jan 2019 16:49:08 +0100 Subject: [PATCH 4/5] fix(oui-dropdown): fix dropdown menu positioning (#349) --- packages/oui-dropdown/src/dropdown.controller.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/oui-dropdown/src/dropdown.controller.js b/packages/oui-dropdown/src/dropdown.controller.js index 15673c8a..efef02c8 100644 --- a/packages/oui-dropdown/src/dropdown.controller.js +++ b/packages/oui-dropdown/src/dropdown.controller.js @@ -145,12 +145,7 @@ export default class { this.popperElement.style.minWidth = `${this.getTriggerWidth()}px`; this.popper = new Popper(this.triggerElement, this.popperElement, { - placement, - modifiers: { - preventOverflow: { - boundariesElement: this.$document[0].body - } - } + placement }); } From fb8ce2f804b7c2838b88fec18f24e4fd772da2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martin?= Date: Mon, 21 Jan 2019 16:49:55 +0100 Subject: [PATCH 5/5] fix(oui-datagrid): fix empty cells when loading data (#348) --- packages/oui-datagrid/src/datagrid.html | 1 + packages/oui-datagrid/src/index.spec.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/oui-datagrid/src/datagrid.html b/packages/oui-datagrid/src/datagrid.html index 8624c676..21013031 100644 --- a/packages/oui-datagrid/src/datagrid.html +++ b/packages/oui-datagrid/src/datagrid.html @@ -65,6 +65,7 @@ column="column" index="rowIndex"> + diff --git a/packages/oui-datagrid/src/index.spec.js b/packages/oui-datagrid/src/index.spec.js index 6c2d23c6..06b433c2 100644 --- a/packages/oui-datagrid/src/index.spec.js +++ b/packages/oui-datagrid/src/index.spec.js @@ -115,7 +115,7 @@ describe("ouiDatagrid", () => { expect(getCell($firstRow, 2).children().html()).toBe(additionnalDataValue); })); - it("should keep undefined when a cell is not loaded", inject(($q) => { + it("should display a skeleton when a cell is not loaded", inject(($q) => { const deferred = $q.defer(); const loadRowSpy = jasmine.createSpy("loadRow"); @@ -138,7 +138,7 @@ describe("ouiDatagrid", () => { expect(loadRowSpy.calls.count()).toEqual(1); expect(getCell($firstRow, 0).children().html()).toBe(fakeData[0].firstName); - expect(getCell($firstRow, 2).children().html()).toBeUndefined(); + expect(getCell($firstRow, 2).children()[0].tagName.toLowerCase()).toBe("oui-skeleton"); })); it("should load data later and display it", inject(($q) => { @@ -557,7 +557,7 @@ describe("ouiDatagrid", () => { expect(getCell($fifthRow, 1).children().html()).toBe(fakeData[4].lastName); }); - it("should keep undefined when a cell is not loaded", inject(($q) => { + it("should display a skeleton when a cell is not loaded", inject(($q) => { const deferred = $q.defer(); const loadRowSpy = jasmine.createSpy("loadRow"); @@ -590,7 +590,7 @@ describe("ouiDatagrid", () => { expect(loadRowSpy.calls.count()).toEqual(1); expect(getCell($firstRow, 0).children().html()).toBe(fakeData[0].firstName); - expect(getCell($firstRow, 2).children().html()).toBeUndefined(); + expect(getCell($firstRow, 2).children()[0].tagName.toLowerCase()).toBe("oui-skeleton"); })); it("should load data later and display it", inject(($q) => {