diff --git a/.travis.yml b/.travis.yml index e3b02c4670..65f3477e94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ env: - MODULE=ng2-alfresco-search - MODULE=ng2-alfresco-upload - MODULE=ng2-alfresco-viewer + - MODULE=ng2-alfresco-activiti-form before_script: - if ([ "$MODULE" != "ng2-alfresco-core" ] && [ "$MODULE" != "ng2-alfresco-viewer" ]); then @@ -47,4 +48,4 @@ before_script: script: npm run test # Send coverage data to Coveralls after_success: - - bash <(curl -s https://codecov.io/bash) \ No newline at end of file + - bash <(curl -s https://codecov.io/bash) diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html index 0447a85c1c..2a1b2f364e 100644 --- a/demo-shell-ng2/app/app.component.html +++ b/demo-shell-ng2/app/app.component.html @@ -15,6 +15,7 @@ DocumentList DataTable Uploader + Activiti Tasks Login @@ -39,11 +40,12 @@
Components List
diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts index f39e2c25cf..f465e6ffdb 100644 --- a/demo-shell-ng2/app/app.component.ts +++ b/demo-shell-ng2/app/app.component.ts @@ -32,6 +32,7 @@ import { SearchComponent } from './components/search/search.component'; import { SearchBarComponent } from './components/search/search-bar.component'; import { LoginDemoComponent } from './components/login/login-demo.component'; import { TasksDemoComponent } from './components/tasks/tasks-demo.component'; +import { ActivitiDemoComponent } from './components/activiti/activiti-demo.component'; declare var document: any; @@ -50,7 +51,8 @@ declare var document: any; {path: '/uploader', name: 'Uploader', component: UploadButtonComponent}, {path: '/login', name: 'Login', component: LoginDemoComponent}, {path: '/search', name: 'Search', component: SearchComponent}, - {path: '/tasks', name: 'Tasks', component: TasksDemoComponent} + {path: '/tasks', name: 'Tasks', component: TasksDemoComponent}, + {path: '/activiti', name: 'Activiti', component: ActivitiDemoComponent} ]) export class AppComponent { translate: AlfrescoTranslationService; diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts new file mode 100644 index 0000000000..4a60f1f811 --- /dev/null +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -0,0 +1,30 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Component } from '@angular/core'; +import { ActivitiForm } from 'ng2-alfresco-activiti-form'; + +@Component({ + selector: 'activiti-demo', + template: ` + + `, + directives: [ActivitiForm] +}) +export class ActivitiDemoComponent { + +} diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index c73bab0da2..be3a831f36 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -81,7 +81,8 @@ "ng2-alfresco-login": "0.2.0", "ng2-alfresco-search": "0.2.0", "ng2-alfresco-upload": "0.2.0", - "ng2-alfresco-viewer": "0.2.0" + "ng2-alfresco-viewer": "0.2.0", + "ng2-alfresco-activiti-form": "0.2.0" }, "devDependencies": { "browser-sync": "2.10.0", @@ -94,7 +95,8 @@ }, "license-check-config": { "src": [ - "./app/**/*.js" + "./app/**/*.js", + "!./app/js/xml2json.js" ], "path": "assets/license_header.txt", "blocking": true, diff --git a/demo-shell-ng2/systemjs.config.js b/demo-shell-ng2/systemjs.config.js index 2e9336eec1..8c5ee68bae 100644 --- a/demo-shell-ng2/systemjs.config.js +++ b/demo-shell-ng2/systemjs.config.js @@ -17,7 +17,8 @@ 'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/dist', 'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/dist', 'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/dist', - 'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/dist' + 'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/dist', + 'ng2-alfresco-activiti-form': 'node_modules/ng2-alfresco-activiti-form/dist' }; // packages tells the System loader how to load when no filename and/or no extension var packages = { @@ -33,7 +34,8 @@ 'ng2-alfresco-login': { main: 'index.js', defaultExtension: 'js'}, 'ng2-alfresco-search': { main: 'index.js', defaultExtension: 'js'}, 'ng2-alfresco-upload': { main: 'index.js', defaultExtension: 'js'}, - 'ng2-alfresco-viewer': { main: 'index.js', defaultExtension: 'js'} + 'ng2-alfresco-viewer': { main: 'index.js', defaultExtension: 'js'}, + 'ng2-alfresco-activiti-form': { main: 'index.js', defaultExtension: 'js'} }; var ngPackageNames = [ 'common', diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts index 9c6c62c988..e2fda465fa 100644 --- a/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts @@ -22,7 +22,7 @@ declare let __moduleName: string; @Component({ moduleId: __moduleName, selector: 'activiti-form', - template: '

Activiti Form Content

' + template: '

Activiti Form Content

' }) export class ActivitiForm {