Merge branch 'development' into dev-denys-723

2025-07-31 17:38:48 +00:00 · 2016-09-09 16:56:25 +01:00
parent ff1e9871c8 a87e85e830
commit 6f93ee739b
23 changed files with 67 additions and 48 deletions
--- a/demo-shell-ng2/app/app.routes.ts
+++ b/demo-shell-ng2/app/app.routes.ts
@@ -40,6 +40,7 @@ export const routes: RouterConfig = [
    { path: 'login', component: LoginDemoComponent },
    { path: 'search', component: SearchComponent },
    { path: 'activiti', component: ActivitiDemoComponent },
+    { path: 'activiti/appId/:appId', component: ActivitiDemoComponent },
    { path: 'activiti/tasks/:id', component: FormViewer },
    { path: 'activiti/tasksnode/:id', component: FormNodeViewer },
    { path: 'webscript', component: WebscriptComponent },
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -13,7 +13,7 @@
                <div class="mdl-grid">
                    <div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp">
                        <span>Task Filters</span>
-                        <activiti-filters (filterClick)="onTaskFilterClick($event)"></activiti-filters>
+                        <activiti-filters [appId]="appId" (filterClick)="onTaskFilterClick($event)"></activiti-filters>
                    </div>
                    <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp">
                        <span>Task List</span>
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -19,6 +19,8 @@ import { Component, AfterViewChecked, ViewChild, Input } from '@angular/core';
 import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist';
 import { ACTIVITI_PROCESSLIST_DIRECTIVES } from 'ng2-activiti-processlist';
 import { ActivitiForm } from 'ng2-activiti-form';
+import { ActivatedRoute } from '@angular/router';
+import { Subscription } from 'rxjs/Rx';

 declare let __moduleName: string;
 declare var componentHandler;
@@ -55,6 +57,8 @@ export class ActivitiDemoComponent implements AfterViewChecked {
    taskFilter: any;
    processFilter: any;

+    private sub: Subscription;
+
    @Input()
    appId: string;

@@ -70,7 +74,7 @@ export class ActivitiDemoComponent implements AfterViewChecked {
        return this.currentChoice === 'task-list';
    }

-    constructor() {
+    constructor(private route: ActivatedRoute) {
        this.taskSchemaColumns = [
            {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true}
            // {type: 'text', key: 'created', title: 'Created', sortable: true}
@@ -80,6 +84,16 @@ export class ActivitiDemoComponent implements AfterViewChecked {
        ];
    }

+    ngOnInit() {
+        this.sub = this.route.params.subscribe(params => {
+            this.appId = params['appId'];
+        });
+    }
+
+    ngOnDestroy() {
+        this.sub.unsubscribe();
+    }
+
    onTaskFilterClick(event: any) {
        this.taskFilter = event;
        this.activititasklist.load(this.taskFilter.filter);
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -76,18 +76,18 @@
    "pdfjs-dist": "1.5.404",
    "flag-icon-css": "2.3.0",
    "intl": "1.2.4",
-    "ng2-alfresco-core": "0.3.0",
-    "ng2-alfresco-datatable": "0.3.0",
-    "ng2-alfresco-documentlist": "0.3.0",
-    "ng2-alfresco-login": "0.3.0",
-    "ng2-alfresco-search": "0.3.0",
-    "ng2-alfresco-upload": "0.3.0",
-    "ng2-alfresco-viewer": "0.3.0",
-    "ng2-activiti-form": "0.3.0",
-    "ng2-activiti-tasklist": "0.3.0",
-    "ng2-activiti-processlist": "0.3.0",
-    "ng2-alfresco-webscript": "0.3.0",
-    "ng2-alfresco-tag": "0.3.0"
+    "ng2-alfresco-core": "0.3.2",
+    "ng2-alfresco-datatable": "0.3.2",
+    "ng2-alfresco-documentlist": "0.3.2",
+    "ng2-alfresco-login": "0.3.2",
+    "ng2-alfresco-search": "0.3.2",
+    "ng2-alfresco-upload": "0.3.2",
+    "ng2-alfresco-viewer": "0.3.2",
+    "ng2-activiti-form": "0.3.3",
+    "ng2-activiti-tasklist": "0.3.3",
+    "ng2-activiti-processlist": "0.3.2",
+    "ng2-alfresco-webscript": "0.3.2",
+    "ng2-alfresco-tag": "0.3.2"
  },
  "devDependencies": {
    "concurrently": "2.0.0",
--- a/ng2-components/ng2-activiti-form/package.json
+++ b/ng2-components/ng2-activiti-form/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-activiti-form",
  "description": "Alfresco Activiti Form Component for Angular 2",
-  "version": "0.3.0",
+  "version": "0.3.3",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -65,7 +65,7 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "0.6.12",
    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "^0.3.0"
+    "ng2-alfresco-core": "0.3.2"
  },
  "peerDependencies": {
    "material-design-icons": "^2.2.3",
--- a/ng2-components/ng2-activiti-processlist/package.json
+++ b/ng2-components/ng2-activiti-processlist/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-activiti-processlist",
  "description": "Show active processes from the Activiti BPM suite",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -63,9 +63,9 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "^0.6.12",
    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "0.3.0",
-    "ng2-alfresco-datatable": "0.3.0",
-    "ng2-activiti-tasklist": "0.3.0"
+    "ng2-alfresco-core": "0.3.2",
+    "ng2-alfresco-datatable": "0.3.2",
+    "ng2-activiti-tasklist": "0.3.2"
  },
  "devDependencies": {
    "angular-cli": "1.0.0-beta.9",
--- a/ng2-components/ng2-activiti-tasklist/package.json
+++ b/ng2-components/ng2-activiti-tasklist/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-activiti-tasklist",
  "description": "Activiti Angular2 Task List Component",
-  "version": "0.3.0",
+  "version": "0.3.3",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -67,9 +67,9 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "0.6.12",
    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "0.3.0",
-    "ng2-alfresco-datatable": "0.3.0",
-    "ng2-activiti-form": "0.3.0",
+    "ng2-alfresco-core": "0.3.2",
+    "ng2-alfresco-datatable": "0.3.2",
+    "ng2-activiti-form": "0.3.3",
    "alfresco-js-api": "^0.3.0"
  },
  "peerDependencies": {
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-core",
  "description": "Alfresco Angular 2 Components core",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-datatable",
  "description": "Alfresco Angular2 DataTable Component",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -63,7 +63,7 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "0.6.12",
    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "0.3.0"
+    "ng2-alfresco-core": "0.3.2"
  },
  "peerDependencies": {
    "material-design-icons": "^2.2.3",
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css
@@ -105,3 +105,8 @@
        display: none;
    }
 }
+
+.mdl-data-table-fix-firefox{
+    border-collapse: unset;
+    border-spacing: 0;
+}
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
@@ -1,6 +1,6 @@
 <table
    *ngIf="data"
-    class="mdl-data-table mdl-js-data-table full-width">
+    class="mdl-data-table mdl-js-data-table full-width mdl-data-table-fix-firefox">
    <thead>
    <tr>
        <!-- Columns -->
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-documentlist",
  "description": "Alfresco Angular2 Document List Component",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -70,9 +70,9 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "0.6.12",
    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "0.3.0",
-    "ng2-alfresco-datatable": "0.3.0",
-    "alfresco-js-api": "^0.3.0"
+    "ng2-alfresco-core": "0.3.2",
+    "ng2-alfresco-datatable": "0.3.2",
+    "alfresco-js-api": "^0.3.1"
  },
  "peerDependencies": {
    "material-design-icons": "^2.2.3",
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-login",
  "description": "Alfresco Angular2 Login Component",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -74,7 +74,7 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "0.6.12",
    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "0.3.0",
+    "ng2-alfresco-core": "0.3.2",
    "alfresco-js-api": "^0.3.0",
    "coveralls": "^2.11.9"
  },
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-search",
  "description": "Alfresco Angular2 Search Component",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -71,7 +71,7 @@
    "zone.js": "0.6.12",
    "ng2-translate": "2.2.2",
    "alfresco-js-api": "^0.3.0",
-    "ng2-alfresco-core": "^0.3.0"
+    "ng2-alfresco-core": "0.3.2"
  },
  "peerDependencies": {
    "material-design-icons": "^2.2.3",
--- a/ng2-components/ng2-alfresco-tag/package.json
+++ b/ng2-components/ng2-alfresco-tag/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-tag",
  "description": "Alfresco tag component",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "main": "./dist/index.js",
  "typings": "./dist/index.d.ts",
@@ -47,7 +47,7 @@
    "alfresco-js-api": "^0.3.0",

    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "^0.3.0",
+    "ng2-alfresco-core": "0.3.2",
    "reflect-metadata": "^0.1.3",
    "rxjs": "5.0.0-beta.6",
    "zone.js": "^0.6.12"
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-upload",
  "description": "Alfresco Angular2 Upload Component",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -72,7 +72,7 @@
    "zone.js": "0.6.12",
    "ng2-translate": "2.2.2",
    "alfresco-js-api": "^0.3.0",
-    "ng2-alfresco-core": "0.3.0"
+    "ng2-alfresco-core": "0.3.2"
  },
  "peerDependencies": {
    "material-design-icons": "^2.2.3",
--- a/ng2-components/ng2-alfresco-viewer/.npmignore
+++ b/ng2-components/ng2-alfresco-viewer/.npmignore
@@ -1,5 +1,6 @@
 npm-debug.log
 .idea
+demo/localTestFile.pdf

 assets/
 coverage/
--- a/ng2-components/ng2-alfresco-viewer/demo/localImg.jpg
+++ b/ng2-components/ng2-alfresco-viewer/demo/localImg.jpg
--- a/ng2-components/ng2-alfresco-viewer/demo/localTestFile.pdf
+++ b/ng2-components/ng2-alfresco-viewer/demo/localTestFile.pdf
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-viewer",
  "description": "Alfresco documents viewer",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "scripts": {
    "postinstall": "typings install",
@@ -58,11 +58,9 @@
    "@angular/router": "3.0.0-alpha.7",
    "@angular/router-deprecated": "2.0.0-rc.2",
    "@angular/upgrade": "2.0.0-rc.3",
-
-    "ng2-alfresco-core": "0.3.0",
+    "ng2-alfresco-core": "0.3.2",
    "ng2-translate": "2.2.2",
    "alfresco-js-api": "^0.3.0",
-
    "systemjs": "0.19.27",
    "core-js": "2.4.0",
    "reflect-metadata": "0.1.3",
--- a/ng2-components/ng2-alfresco-viewer/src/assets/fake-test-file.pdf
+++ b/ng2-components/ng2-alfresco-viewer/src/assets/fake-test-file.pdf
--- a/ng2-components/ng2-alfresco-webscript/package.json
+++ b/ng2-components/ng2-alfresco-webscript/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ng2-alfresco-webscript",
  "description": "Alfresco webscript executor",
-  "version": "0.3.0",
+  "version": "0.3.2",
  "author": "Alfresco Software, Ltd.",
  "main": "./dist/index.js",
  "typings": "./dist/index.d.ts",
@@ -47,8 +47,8 @@
    "alfresco-js-api": "^0.3.0",

    "ng2-translate": "2.2.2",
-    "ng2-alfresco-core": "^0.3.0",
-    "ng2-alfresco-datatable": "^0.3.0",
+    "ng2-alfresco-core": "0.3.2",
+    "ng2-alfresco-datatable": "0.3.2",
    "reflect-metadata": "^0.1.3",
    "rxjs": "5.0.0-beta.6",
    "zone.js": "^0.6.12"