Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toolbars - clean up, move remnants to gtl #434

Merged
merged 4 commits into from
Feb 28, 2020
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
1 change: 0 additions & 1 deletion application-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.exports = {
stylesheetFolder: 'css',
appName: 'ui-components',
modules: {
toolbar: '/toolbar',
common: '/common',
dialogEditor: '/dialog-editor',
gtl: '/gtl',
Expand Down
2 changes: 0 additions & 2 deletions demo/controllers/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import AvailableComponentsController from './availableComponentsController';
import ToolbarMenuController from './toolbarMenuController';
import DataTableController from './dataTableController';
import FonticonPickerController from './fonticonPickerController';
import DialogUserController from './dialogUserController';
Expand All @@ -11,7 +10,6 @@ import * as ng from 'angular';

export default (module: ng.IModule) => {
module.controller('demoAvailableComponents', AvailableComponentsController);
module.controller('demoToolbarMenu', ToolbarMenuController);
module.controller('demoDataTable', DataTableController);
module.controller('demoFonticonPicker', FonticonPickerController);
module.controller('demoDialogUser', DialogUserController);
Expand Down
55 changes: 0 additions & 55 deletions demo/controllers/toolbarMenuController.ts

This file was deleted.

12 changes: 0 additions & 12 deletions demo/data/custom_toolbar.json

This file was deleted.

235 changes: 0 additions & 235 deletions demo/data/toolbar.json

This file was deleted.

1 change: 0 additions & 1 deletion demo/services/availableComponentsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export default class AvailableComponentsService {

public initComponents() {
this.availableComponents = [
new AvailableGroup('toolbar-menu', 'Toolbar Menu Components', '/toolbar-menu', []),
new AvailableGroup('tile-menu', 'Tile Components', '/tile-view', []),
new AvailableGroup('data-table', 'Data table Components', '/data-table', []),
new AvailableGroup('fonticon-picker', 'Fonticon Picker Components', '/fonticon-picker', []),
Expand Down
9 changes: 0 additions & 9 deletions demo/views/toolbar-menu/basic.html

This file was deleted.

6 changes: 0 additions & 6 deletions demo/views/toolbar-menu/custom-html.html

This file was deleted.

1 change: 0 additions & 1 deletion src/gtl/components/data-table/dataTableComponent.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ describe('DataTable test', () => {
let scope, compile, compiledElement;
beforeEach(() => {
angular.mock.module('miqStaticAssets.common');
angular.mock.module('miqStaticAssets.toolbar');
angular.mock.module('miqStaticAssets.gtl');
angular.mock.inject(($rootScope, $compile: ng.ICompileService) => {
scope = $rootScope.$new();
Expand Down
1 change: 0 additions & 1 deletion src/gtl/components/pagination/paginationComponent.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ describe('Pagination test', () => {
let scope, compile, compiledElement;
beforeEach(() => {
angular.mock.module('miqStaticAssets.common');
angular.mock.module('miqStaticAssets.toolbar');
angular.mock.module('miqStaticAssets.gtl');
angular.mock.inject(($rootScope, $compile: ng.ICompileService) => {
scope = $rootScope.$new();
Expand Down
1 change: 0 additions & 1 deletion src/gtl/components/tile-view/tileViewComponent.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ describe('tile component test', () => {
beforeEach(() => {
angular.mock.module('miqStaticAssets');
angular.mock.module('miqStaticAssets.common');
angular.mock.module('miqStaticAssets.toolbar');
angular.mock.inject(($rootScope, $compile: ng.ICompileService) => {
scope = $rootScope.$new();
compile = $compile;
Expand Down
4 changes: 3 additions & 1 deletion src/gtl/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import services from './services';
import filters from './filters';
import components from './components';
import toolbarMenu from './toolbar-menu';
import * as angular from 'angular';

module gtl {
export const app = angular.module('miqStaticAssets.gtl', []);
export const app = angular.module('miqStaticAssets.gtl', ['miqStaticAssets.common']);
services(app);
filters(app);
components(app);
toolbarMenu(app);
}
7 changes: 7 additions & 0 deletions src/gtl/toolbar-menu/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import ToolbarClick from './toolbarClickDirective';
import ToolbarList from './toolbarListComponent';

export default (module: ng.IModule) => {
module.component('miqToolbarList', new ToolbarList);
module.directive('miqToolbarClick', ToolbarClick.Factory());
};
Loading