inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix dropdown visibility #1593 (#1767)

Browse Source 
* fix dropdown visibility #1593

* fix test search workaround material2 issue 1913
This commit is contained in:
Eugenio Romano 2017-03-30 10:26:18 +01:00 committed by Mario Romano
parent c316fcac18
commit f75e2b05ea
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html
View File

@ -2,16 +2,16 @@
<span class="mdl-paging__per-page"> <span class="mdl-paging__per-page">
<span class="mdl-paging__per-page-label">Rows per page:</span> <span class="mdl-paging__per-page-label">Rows per page:</span>
<span class="mdl-paging__per-page-value" [attr.data-automation-id]="'rows_per_page_' + pageSize">{{pagination.maxItems}}</span> <span class="mdl-paging__per-page-value" [attr.data-automation-id]="'rows_per_page_' + pageSize">{{pagination.maxItems}}</span>
<button alfresco-mdl-button id="pageSizePicker" class="mdl-button--icon mdl-paging__per-page-dropdown">
<i class="material-icons">arrow_drop_down</i> <md-menu #appMenu="mdMenu" for="pageSizePicker">
</button> <div *ngFor="let size of supportedPageSizes"
<ul alfresco-mdl-menu for="pageSizePicker" class="mdl-menu--bottom-right"> tabindex="-1" [attr.data-value]="size" md-menu-item (click)="setPageSize(size)">
<li *ngFor="let size of supportedPageSizes"
tabindex="-1" [attr.data-value]="size" class="mdl-menu__item"
(click)="setPageSize(size)">
<span>{{size}}</span> <span>{{size}}</span>
</li> </div>
</ul> </md-menu>
<button id="pageSizePicker" md-icon-button [mdMenuTriggerFor]="appMenu">
<md-icon>arrow_drop_down</md-icon>
</button>
</span> </span>
<span class="mdl-paging__count">{{summary}}</span> <span class="mdl-paging__count">{{summary}}</span>
<button (click)="showPrevPage()" <button (click)="showPrevPage()"

9
ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
View File

@ -116,6 +116,8 @@ describe('AlfrescoSearchComponent', () => {
}); });
})); }));
afterEach(() => { fixture.detectChanges(); });
it('should not have a search term by default', () => { it('should not have a search term by default', () => {
expect(component.searchTerm).toBe(''); expect(component.searchTerm).toBe('');
}); });
@ -124,8 +126,11 @@ describe('AlfrescoSearchComponent', () => {
let injector = ReflectiveInjector.resolveAndCreate([ let injector = ReflectiveInjector.resolveAndCreate([
{provide: ActivatedRoute, useValue: {params: Observable.from([{q: 'exampleTerm692'}])}} {provide: ActivatedRoute, useValue: {params: Observable.from([{q: 'exampleTerm692'}])}}
]); ]);
let search = new AlfrescoSearchComponent(null, null, injector.get(ActivatedRoute)); let search = new AlfrescoSearchComponent(null, null, injector.get(ActivatedRoute));
search.ngOnInit(); search.ngOnInit();
expect(search.searchTerm).toBe('exampleTerm692'); expect(search.searchTerm).toBe('exampleTerm692');
}); });
@ -140,14 +145,18 @@ describe('AlfrescoSearchComponent', () => {
{provide: ActivatedRoute, useValue: {params: Observable.from([{}])}} {provide: ActivatedRoute, useValue: {params: Observable.from([{}])}}
]); ]);
let search = new AlfrescoSearchComponent(injector.get(AlfrescoSearchService), null, injector.get(ActivatedRoute)); let search = new AlfrescoSearchComponent(injector.get(AlfrescoSearchService), null, injector.get(ActivatedRoute));
search.ngOnInit(); search.ngOnInit();
expect(search.searchTerm).toBeNull(); expect(search.searchTerm).toBeNull();
}); });
it('should setup i18n folder', () => { it('should setup i18n folder', () => {
let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
spyOn(translationService, 'addTranslationFolder'); spyOn(translationService, 'addTranslationFolder');
fixture.detectChanges(); fixture.detectChanges();
expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
}); });

6
scripts/npm-build-all.sh
View File

@ -71,9 +71,13 @@ do
build_project $DESTDIR $PACKAGE build_project $DESTDIR $PACKAGE
done done
#Install demo
cd "$DIR/../demo-shell-ng2"
npm install
if $RUN_LINK == true; then if $RUN_LINK == true; then
#LINK ALL THE COMPONENTS INSIDE THE DEMO-SHELL #LINK ALL THE COMPONENTS INSIDE THE DEMO-SHELL
cd "$DIR/../demo-shell-ng2"
for PACKAGE in ${projects[@]} for PACKAGE in ${projects[@]}
do do
DESTDIR="$DIR/../ng2-components/${PACKAGE}" DESTDIR="$DIR/../ng2-components/${PACKAGE}"