Skip to content

Commit

Permalink
Merge pull request #635 from lumapps/feat/legacy-dropdown
Browse files Browse the repository at this point in the history
feat: legacy dropdown, popover, select, chip and list
  • Loading branch information
matmkian authored Sep 4, 2019
2 parents 6d47a1f + b4f8548 commit f45959e
Show file tree
Hide file tree
Showing 44 changed files with 19,313 additions and 16,591 deletions.
6 changes: 6 additions & 0 deletions core/js/lumx.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ angular.module('lumx.utils', [

angular.module('lumx.button', []);
angular.module('lumx.checkbox', []);
angular.module('lumx.chip', []);
angular.module('lumx.data-table', []);
angular.module('lumx.date-picker', []);
angular.module('lumx.dialog', ['lumx.utils.event-scheduler']);
angular.module('lumx.dropdown', ['lumx.utils.event-scheduler']);
angular.module('lumx.fab', []);
angular.module('lumx.file-input', []);
angular.module('lumx.icon', []);
angular.module('lumx.list', []);
angular.module('lumx.notification', ['lumx.utils.event-scheduler']);
angular.module('lumx.popover', []);
angular.module('lumx.progress', []);
angular.module('lumx.radio-button', []);
angular.module('lumx.ripple', []);
Expand All @@ -44,14 +47,17 @@ angular.module('lumx.tooltip', []);
angular.module('lumx', [
'lumx.button',
'lumx.checkbox',
'lumx.chip',
'lumx.data-table',
'lumx.date-picker',
'lumx.dialog',
'lumx.dropdown',
'lumx.fab',
'lumx.file-input',
'lumx.icon',
'lumx.list',
'lumx.notification',
'lumx.popover',
'lumx.progress',
'lumx.radio-button',
'lumx.ripple',
Expand Down
8 changes: 7 additions & 1 deletion core/js/utils/event-scheduler_service.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ function EventSchedulerService($document, LxUtilsService) {
* @param {Event} evt The event.
*/
function _handle(evt) {
const scheduler = _schedule[evt.type];
let scheduler;

for (const [key] of Object.entries(_schedule)) {
if (key.includes(evt.type)) {
scheduler = _schedule[key];
}
}

if (angular.isDefined(scheduler)) {
for (let i = 0, len = scheduler.length; i < len; i++) {
Expand Down
1 change: 0 additions & 1 deletion core/scss/_legacy-theme-lumapps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ $mdi-font-path: '../../node_modules/@mdi/font/fonts' !default;
@import '../../modules/radio-button/scss/radio-button';
@import '../../modules/ripple/scss/ripple';
@import '../../modules/search-filter/scss/search-filter';
@import '../../modules/select/scss/select';
@import '../../modules/stepper/scss/stepper';
@import '../../modules/switch/scss/switch';
@import '../../modules/tabs/scss/tabs';
Expand Down
Loading

0 comments on commit f45959e

Please sign in to comment.