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

Code improvements

Browse Source
This commit is contained in:
Denys Vuika 2016-07-05 21:36:37 +01:00
parent 0f0c5352c7
commit ce23d73293
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -17,7 +17,7 @@ before_install:
- export CHROME_BIN=/usr/bin/google-chrome - export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start - 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: env:
matrix: matrix:

20
ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts
View File

@ -15,12 +15,20 @@
* limitations under the License. * limitations under the License.
*/ */
import {Component, OnInit, OnChanges, Input, Output, EventEmitter} from '@angular/core'; import {
import {ContentActionModel} from './../models/content-action.model'; Component,
import {ContentActionList} from './content-action-list'; OnInit,
import {DocumentActionsService} from '../services/document-actions.service'; OnChanges,
import {FolderActionsService} from '../services/folder-actions.service'; Input,
import {ContentActionHandler} from '../models/content-action.model'; 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({ @Component({
selector: 'content-action', selector: 'content-action',

8
ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
View File

@ -34,7 +34,6 @@ import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core';
import { import {
ALFRESCO_DATATABLE_DIRECTIVES, ALFRESCO_DATATABLE_DIRECTIVES,
DataSorting,
DataRowEvent, DataRowEvent,
DataTableComponent, DataTableComponent,
ObjectDataColumn ObjectDataColumn
@ -128,7 +127,7 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af
private documentListService: DocumentListService, private documentListService: DocumentListService,
private ngZone: NgZone) { private ngZone: NgZone) {
this.setupData(); this.data = new ShareDataTableAdapter(this.documentListService, this.baseComponentPath, []);
} }
getContextActions(node: MinimalNodeEntity) { 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) { onShowRowContextMenu(event) {
if (this.contextMenuActions) { if (this.contextMenuActions) {
let args = event.args; let args = event.args;