Skip to content
This repository was archived by the owner on Aug 7, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/oui-action-menu/src/action-menu.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ export default {
text: "@",
align: "@?",
ariaLabel: "@?",
compact: "<?"
compact: "<?",
disabled: "<?"
},
transclude: true
};
6 changes: 4 additions & 2 deletions packages/oui-action-menu/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import ActionMenu from "./action-menu.component.js";
import DropdownDivider from "../../oui-dropdown/src/divider/dropdown-divider.component";
import DropdownItem from "../../oui-dropdown/src/item/dropdown-item.component";

angular.module("oui.action-menu", [])
export default angular
.module("oui.action-menu", [])
.component("ouiActionMenu", ActionMenu)
.component("ouiActionMenuDivider", DropdownDivider)
.component("ouiActionMenuItem", DropdownItem);
.component("ouiActionMenuItem", DropdownItem)
.name;
148 changes: 76 additions & 72 deletions packages/oui-angular/src/index.js
Original file line number Diff line number Diff line change
@@ -1,75 +1,79 @@
import "@oui-angular/oui-button/src";
import "@oui-angular/oui-calendar/src";
import "@oui-angular/oui-checkbox/src";
import "@oui-angular/oui-collapsible/src";
import "@oui-angular/oui-radio/src";
import "@oui-angular/oui-message/src";
import "@oui-angular/oui-spinner/src";
import "@oui-angular/oui-back-button/src";
import "@oui-angular/oui-dropdown/src";
import "@oui-angular/oui-action-menu/src";
import "@oui-angular/oui-tooltip/src";
import "@oui-angular/oui-numeric/src";
import "@oui-angular/oui-pagination/src";
import "@oui-angular/oui-datagrid/src";
import "@oui-angular/oui-navbar/src";
import "@oui-angular/oui-modal/src";
import "@oui-angular/oui-field/src";
import "@oui-angular/oui-radio-group/src";
import "@oui-angular/oui-radio-toggle-group/src";
import "@oui-angular/oui-select/src";
import "@oui-angular/oui-select-picker/src";
import "@oui-angular/oui-textarea/src";
import "@oui-angular/oui-form-actions/src";
import "@oui-angular/oui-search/src";
import "@oui-angular/oui-criteria-container/src";
import "@oui-angular/oui-criteria-adder/src";
import "@oui-angular/oui-chips/src";
import "@oui-angular/oui-popover/src";
import "@oui-angular/oui-stepper/src";
import "@oui-angular/oui-skeleton/src";
import "@oui-angular/oui-clipboard/src";
import "@oui-angular/oui-slideshow/src";
import "@oui-angular/oui-page-header/src";
import "@oui-angular/oui-tile/src";
import "@oui-angular/oui-guide-menu/src";
import "@oui-angular/oui-header-tabs/src";
import ActionMenu from "@oui-angular/oui-action-menu/src";
import BackButton from "@oui-angular/oui-back-button/src";
import Button from "@oui-angular/oui-button/src";
import Calendar from "@oui-angular/oui-calendar/src";
import Checkbox from "@oui-angular/oui-checkbox/src";
import Chips from "@oui-angular/oui-chips/src";
import Clipboard from "@oui-angular/oui-clipboard/src";
import Collapsible from "@oui-angular/oui-collapsible/src";
import CriteriaAdder from "@oui-angular/oui-criteria-adder/src";
import CriteriaContainer from "@oui-angular/oui-criteria-container/src";
import Datagrid from "@oui-angular/oui-datagrid/src";
import Dropdown from "@oui-angular/oui-dropdown/src";
import Field from "@oui-angular/oui-field/src";
import FormActions from "@oui-angular/oui-form-actions/src";
import GuideMenu from "@oui-angular/oui-guide-menu/src";
import HeaderTabs from "@oui-angular/oui-header-tabs/src";
import Message from "@oui-angular/oui-message/src";
import Modal from "@oui-angular/oui-modal/src";
import Navbar from "@oui-angular/oui-navbar/src";
import Numeric from "@oui-angular/oui-numeric/src";
import PageHeader from "@oui-angular/oui-page-header/src";
import Pagination from "@oui-angular/oui-pagination/src";
import Popover from "@oui-angular/oui-popover/src";
import Progress from "@oui-angular/oui-progress/src";
import Radio from "@oui-angular/oui-radio/src";
import RadioGroup from "@oui-angular/oui-radio-group/src";
import RadioToggleGroup from "@oui-angular/oui-radio-toggle-group/src";
import Search from "@oui-angular/oui-search/src";
import Select from "@oui-angular/oui-select/src";
import SelectPicker from "@oui-angular/oui-select-picker/src";
import Skeleton from "@oui-angular/oui-skeleton/src";
import Slideshow from "@oui-angular/oui-slideshow/src";
import Spinner from "@oui-angular/oui-spinner/src";
import Stepper from "@oui-angular/oui-stepper/src";
import Switch from "@oui-angular/oui-switch/src";
import Textarea from "@oui-angular/oui-textarea/src";
import Tile from "@oui-angular/oui-tile/src";
import Tooltip from "@oui-angular/oui-tooltip/src";

angular.module("oui", [
"oui.button",
"oui.calendar",
"oui.checkbox",
"oui.collapsible",
"oui.radio",
"oui.message",
"oui.spinner",
"oui.back-button",
"oui.dropdown",
"oui.action-menu",
"oui.tooltip",
"oui.numeric",
"oui.pagination",
"oui.datagrid",
"oui.navbar",
"oui.modal",
"oui.field",
"oui.radio-group",
"oui.select",
"oui.select-picker",
"oui.textarea",
"oui.form-actions",
"oui.search",
"oui.criteria-container",
"oui.radio-toggle-group",
"oui.criteria-adder",
"oui.chips",
"oui.popover",
"oui.stepper",
"oui.skeleton",
"oui.clipboard",
"oui.slideshow",
"oui.page-header",
"oui.tile",
"oui.guide-menu",
"oui.header-tabs"
ActionMenu,
BackButton,
Button,
Calendar,
Checkbox,
Chips,
Clipboard,
Collapsible,
CriteriaAdder,
CriteriaContainer,
Datagrid,
Dropdown,
Field,
FormActions,
GuideMenu,
HeaderTabs,
Message,
Modal,
Navbar,
Numeric,
PageHeader,
Pagination,
Popover,
Progress,
Radio,
RadioGroup,
RadioToggleGroup,
Search,
Select,
SelectPicker,
Skeleton,
Slideshow,
Spinner,
Stepper,
Switch,
Textarea,
Tile,
Tooltip
]);
2 changes: 2 additions & 0 deletions packages/oui-angular/src/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ loadTests(require.context("../../oui-page-header/src/", true, /.*((\.spec)|(inde
loadTests(require.context("../../oui-tile/src/", true, /.*((\.spec)|(index))$/));
loadTests(require.context("../../oui-guide-menu/src/", true, /.*((\.spec)|(index))$/));
loadTests(require.context("../../oui-header-tabs/src/", true, /.*((\.spec)|(index))$/));
loadTests(require.context("../../oui-progress/src/", true, /.*((\.spec)|(index))$/));
loadTests(require.context("../../oui-switch/src/", true, /.*((\.spec)|(index))$/));

function loadTests (context) {
context.keys().forEach(context);
Expand Down
5 changes: 4 additions & 1 deletion packages/oui-back-button/src/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import BackButton from "./back-button.component.js";

angular.module("oui.back-button", []).component("ouiBackButton", BackButton);
export default angular
.module("oui.back-button", [])
.component("ouiBackButton", BackButton)
.name;
5 changes: 4 additions & 1 deletion packages/oui-button/src/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import Button from "./button.component.js";

angular.module("oui.button", []).component("ouiButton", Button);
export default angular
.module("oui.button", [])
.component("ouiButton", Button)
.name;
2 changes: 1 addition & 1 deletion packages/oui-calendar/src/calendar.provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "flatpickr/dist/l10n/nl.js";
import "flatpickr/dist/l10n/pl.js";
import "flatpickr/dist/l10n/pt.js";
import "flatpickr/dist/l10n/sk.js";
import { merge } from "lodash";
import merge from "lodash/merge";

export default class {
constructor () {
Expand Down
5 changes: 3 additions & 2 deletions packages/oui-calendar/src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Calendar from "./calendar.component.js";
import CalendarProvider from "./calendar.provider";

angular
export default angular
.module("oui.calendar", [])
.component("ouiCalendar", Calendar)
.provider("ouiCalendarConfiguration", CalendarProvider);
.provider("ouiCalendarConfiguration", CalendarProvider)
.name;
5 changes: 4 additions & 1 deletion packages/oui-checkbox/src/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import Checkbox from "./checkbox.component.js";

angular.module("oui.checkbox", []).component("ouiCheckbox", Checkbox);
export default angular
.module("oui.checkbox", [])
.component("ouiCheckbox", Checkbox)
.name;
5 changes: 4 additions & 1 deletion packages/oui-chips/src/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import Chips from "./chips.component.js";

angular.module("oui.chips", []).component("ouiChips", Chips);
export default angular
.module("oui.chips", [])
.component("ouiChips", Chips)
.name;
2 changes: 1 addition & 1 deletion packages/oui-chips/src/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cloneDeep } from "lodash";
import cloneDeep from "lodash/cloneDeep";
import mockData from "./index.spec.data.json";

describe("ouiChips", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/oui-clipboard/src/clipboard.provider.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { merge } from "lodash";
import merge from "lodash/merge";
export default class {
constructor () {
this.translations = {
Expand Down
14 changes: 8 additions & 6 deletions packages/oui-clipboard/src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import Clipboard from "./clipboard.component.js";
import ClipboardProvider from "./clipboard.provider.js";

angular
.module("oui.clipboard", []).component("ouiClipboard", Clipboard)
.provider("ouiClipboardConfiguration", ClipboardProvider);
import Clipboard from "./clipboard.component.js";
import ClipboardProvider from "./clipboard.provider.js";

export default angular
.module("oui.clipboard", [])
.component("ouiClipboard", Clipboard)
.provider("ouiClipboardConfiguration", ClipboardProvider)
.name;
6 changes: 4 additions & 2 deletions packages/oui-collapsible/src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import Collapsible from "./collapsible.component.js";

angular.module("oui.collapsible", [])
.component("ouiCollapsible", Collapsible);
export default angular
.module("oui.collapsible", [])
.component("ouiCollapsible", Collapsible)
.name;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { addDefaultParameter } from "@oui-angular/common/component-utils";
import { get } from "lodash";
import get from "lodash/get";

export default class {
constructor ($attrs, $element, $scope, $timeout, ouiCriteriaAdderConfiguration) {
Expand Down
5 changes: 3 additions & 2 deletions packages/oui-criteria-adder/src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import CriteriaAdder from "./criteria-adder.component";
import CriteriaAdderProvider from "./criteria-adder.provider";

angular
export default angular
.module("oui.criteria-adder", [])
.component("ouiCriteriaAdder", CriteriaAdder)
.provider("ouiCriteriaAdderConfiguration", CriteriaAdderProvider);
.provider("ouiCriteriaAdderConfiguration", CriteriaAdderProvider)
.name;
2 changes: 1 addition & 1 deletion packages/oui-criteria-adder/src/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { find } from "lodash";
import find from "lodash/find";
import mockData from "./index.spec.data.json";

const getValueComponent = $element => $element[0].querySelector("[name=barValue]");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { findIndex } from "lodash";
import findIndex from "lodash/findIndex";

export default class CriteriaController {
$onInit () {
Expand Down
6 changes: 4 additions & 2 deletions packages/oui-criteria-container/src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import CriteriaContainer from "./criteria-container.component";

angular.module("oui.criteria-container", [])
.component("ouiCriteriaContainer", CriteriaContainer);
export default angular
.module("oui.criteria-container", [])
.component("ouiCriteriaContainer", CriteriaContainer)
.name;
2 changes: 1 addition & 1 deletion packages/oui-datagrid/src/datagrid.controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { addBooleanParameter } from "@oui-angular/common/component-utils";
import { find } from "lodash";
import find from "lodash/find";
import { hasProperty } from "./util";

import template from "./datagrid.html";
Expand Down
3 changes: 2 additions & 1 deletion packages/oui-datagrid/src/filter/comparator-resolver.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { endsWith, negate } from "lodash";
import BasicComparators from "./basic";
import DateComparators from "./date";
import endsWith from "lodash/endsWith";
import negate from "lodash/negate";
import NumberComparators from "./number";
import StringComparators from "./string";

Expand Down
3 changes: 2 additions & 1 deletion packages/oui-datagrid/src/filter/date.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { isDate, isNaN } from "lodash";
import isDate from "lodash/isDate";
import isNaN from "lodash/isNaN";

export default class DateComparators {
static is (subject, value) {
Expand Down
3 changes: 2 additions & 1 deletion packages/oui-datagrid/src/filter/filter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { find, get } from "lodash";
import ComparatorResolver from "./comparator-resolver";
import find from "lodash/find";
import get from "lodash/get";
import StringComparators from "./string";

export default class Filter {
Expand Down
5 changes: 3 additions & 2 deletions packages/oui-datagrid/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import DatagridParameters from "./parameters/datagrid-parameters.component";
import DatagridProvider from "./datagrid.provider";
import DatagridService from "./datagrid.service";

angular
export default angular
.module("oui.datagrid", [
"oui.pagination",
"oui.dropdown",
Expand All @@ -22,4 +22,5 @@ angular
.service("ouiDatagridPaging", DatagridPaging)
.provider("ouiDatagridConfiguration", DatagridProvider)
.service("ouiDatagridService", DatagridService)
.component("ouiDatagridParameters", DatagridParameters);
.component("ouiDatagridParameters", DatagridParameters)
.name;
12 changes: 12 additions & 0 deletions packages/oui-field/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@
</oui-field>
</form>
```
### Switch

```html:preview
<form novalidate name="switchForm">
<oui-field label="Switch options" help-text="Helper text">
<oui-switch
name="switch"
model="$ctrl.switch"
required></oui-switch>
</oui-field>
</form>
```

### Radio

Expand Down
2 changes: 1 addition & 1 deletion packages/oui-field/src/field.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ng-bind="::$ctrl.label">
</label>
<oui-popover>
<button type="button" class="oui-popover__help-button" aria-label="Help" oui-popover-trigger></button>
<button type="button" class="oui-popover-button" aria-label="Help" oui-popover-trigger></button>
<oui-popover-content>
<div class="oui-field__label-popover" id="{{:: $ctrl.popoverId }}"
ng-bind-html=":: $ctrl.labelPopover"></div>
Expand Down
6 changes: 4 additions & 2 deletions packages/oui-field/src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import Field from "./field.component.js";
import FieldConfigurationProvider from "./field.provider.js";

angular.module("oui.field", [])
export default angular
.module("oui.field", [])
.component("ouiField", Field)
.provider("ouiFieldConfiguration", FieldConfigurationProvider);
.provider("ouiFieldConfiguration", FieldConfigurationProvider)
.name;
Loading