diff --git a/.travis.yml b/.travis.yml index 2e10547a8d..38bd43820e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - export CHROME_BIN=/usr/bin/google-chrome - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - - cd ng2-components/ng2-alfresco-core; npm version patch; sed -i "s/0\\.0\\.0-PLACEHOLDER/^0.1.0/g" package.json; npm install; npm link + - (cd ng2-components/ng2-alfresco-core; npm version patch; sed -i "s/0\\.0\\.0-PLACEHOLDER/^0.1.0/g" package.json; npm install; npm link) env: matrix: @@ -35,4 +35,4 @@ before_script: script: npm run test # Send coverage data to Coveralls after_success: - - "cat ./coverage/report/lcov.info | ./node_modules/coveralls/bin/coveralls.js --verbose" \ No newline at end of file + - "cat ./coverage/report/lcov.info | ./node_modules/coveralls/bin/coveralls.js --verbose" diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts index aeffefe904..03ad0740c6 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts @@ -15,12 +15,20 @@ * limitations under the License. */ -import {Component, OnInit, OnChanges, Input, Output, EventEmitter} from '@angular/core'; -import {ContentActionModel} from './../models/content-action.model'; -import {ContentActionList} from './content-action-list'; -import {DocumentActionsService} from '../services/document-actions.service'; -import {FolderActionsService} from '../services/folder-actions.service'; -import {ContentActionHandler} from '../models/content-action.model'; +import { + Component, + OnInit, + OnChanges, + Input, + Output, + EventEmitter +} from '@angular/core'; + +import { ContentActionModel } from './../models/content-action.model'; +import { ContentActionList } from './content-action-list'; +import { DocumentActionsService } from '../services/document-actions.service'; +import { FolderActionsService } from '../services/folder-actions.service'; +import { ContentActionHandler } from '../models/content-action.model'; @Component({ selector: 'content-action', diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index 6756c789b2..ca3741ba5b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -34,7 +34,6 @@ import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core'; import { ALFRESCO_DATATABLE_DIRECTIVES, - DataSorting, DataRowEvent, DataTableComponent, ObjectDataColumn @@ -128,7 +127,7 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af private documentListService: DocumentListService, private ngZone: NgZone) { - this.setupData(); + this.data = new ShareDataTableAdapter(this.documentListService, this.baseComponentPath, []); } getContextActions(node: MinimalNodeEntity) { @@ -328,11 +327,6 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af } } - private setupData() { - this.data = new ShareDataTableAdapter(this.documentListService, this.baseComponentPath, []); - this.data.setSorting(new DataSorting('id', 'asc')); - } - onShowRowContextMenu(event) { if (this.contextMenuActions) { let args = event.args;