From 3c1729b9608532cdcc430e0a6612d9c4acda8ea8 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Fri, 15 Sep 2017 11:39:27 +0100 Subject: [PATCH] [ADF-1518] Update material2 beta 10 and angular 4.3.6 (#2304) * ignore pkg lock * update pkg json * date picker update material beta.10 * isDateInstance moment adapter * style and datepicker update material2 beta 10 * update test dateitem to beta10 * regenerate style files * use material icons web font * fix data range material 2 beta 10 * minors cleaning * recreate styles * remove unused componentHandler var * fix failing test checkbox --- .gitignore | 3 +- .../activiti/activiti-demo.component.ts | 7 - demo-shell-ng2/app/vendor.ts | 1 - demo-shell-ng2/index.html | 2 +- demo-shell-ng2/package.json | 33 +- .../ng2-activiti-analytics/package.json | 28 +- ...lytics-report-parameters.component.spec.ts | 2 +- .../widgets/date-range/date-range.widget.html | 26 +- .../widgets/date-range/date-range.widget.scss | 8 +- .../widgets/date-range/date-range.widget.ts | 4 +- .../components/widgets/widget.component.ts | 22 +- .../ng2-activiti-analytics/styles/index.scss | 2 + .../ng2-activiti-diagrams/package.json | 28 +- ng2-components/ng2-activiti-form/package.json | 26 +- .../widgets/amount/amount.widget.scss | 2 +- .../widgets/container/container.widget.scss | 6 +- .../components/widgets/date/date.widget.html | 7 +- .../components/widgets/date/date.widget.scss | 42 +- .../components/widgets/date/date.widget.ts | 10 +- .../widgets/dropdown/dropdown.widget.scss | 24 +- .../editors/date/date.editor.html | 5 +- .../widgets/error/error.component.scss | 8 +- .../src/components/widgets/form.scss | 1 - .../multiline-text/multiline-text.widget.scss | 1 - .../widgets/people/people.widget.scss | 4 +- .../ng2-activiti-processlist/package.json | 26 +- .../ng2-activiti-tasklist/package.json | 28 +- .../src/components/start-task.component.html | 4 +- ng2-components/ng2-alfresco-core/package.json | 29 +- .../prebuilt-themes/adf-blue-orange.css | 762 ++++++++++++------ .../prebuilt-themes/adf-blue-purple.css | 762 ++++++++++++------ .../prebuilt-themes/adf-cyan-orange.css | 762 ++++++++++++------ .../prebuilt-themes/adf-cyan-purple.css | 762 ++++++++++++------ .../prebuilt-themes/adf-green-orange.css | 762 ++++++++++++------ .../prebuilt-themes/adf-green-purple.css | 762 ++++++++++++------ .../prebuilt-themes/adf-indigo-pink.css | 762 ++++++++++++------ .../prebuilt-themes/adf-pink-bluegrey.css | 760 +++++++++++------ .../prebuilt-themes/adf-purple-green.css | 760 +++++++++++------ .../view/card-view-dateitem.component.html | 20 +- .../view/card-view-dateitem.component.scss | 4 +- .../view/card-view-dateitem.component.spec.ts | 9 +- .../view/card-view-dateitem.component.ts | 42 +- .../src/utils/momentDateAdapter.ts | 15 + .../ng2-alfresco-datatable/package.json | 26 +- .../ng2-alfresco-documentlist/package.json | 28 +- .../ng2-alfresco-login/package.json | 28 +- .../ng2-alfresco-search/package.json | 26 +- .../ng2-alfresco-social/package.json | 26 +- ng2-components/ng2-alfresco-tag/package.json | 26 +- .../ng2-alfresco-upload/package.json | 26 +- .../ng2-alfresco-userinfo/package.json | 26 +- .../src/components/user-info.component.scss | 35 +- .../ng2-alfresco-viewer/package.json | 26 +- .../ng2-alfresco-webscript/package.json | 26 +- ng2-components/package.json | 57 +- 55 files changed, 4928 insertions(+), 2761 deletions(-) diff --git a/.gitignore b/.gitignore index b54c390925..fd08a755ee 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ src/environments/ /demo-shell-ng2/ng2-components/ .happypack/ .happypack/ -.history \ No newline at end of file +.history +package-lock.* diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 6e133fce8d..1c938f606b 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -51,8 +51,6 @@ import { Subscription } from 'rxjs/Rx'; import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component'; import { DemoFieldValidator } from './demo-field-validator'; -declare var componentHandler; - const currentProcessIdNew = '__NEW__'; const currentTaskIdNew = '__NEW__'; @@ -384,11 +382,6 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit { } ngAfterViewInit() { - // workaround for MDL issues with dynamic components - if (componentHandler) { - componentHandler.upgradeAllRegistered(); - } - this.loadStencilScriptsInPageFromActiviti(); } diff --git a/demo-shell-ng2/app/vendor.ts b/demo-shell-ng2/app/vendor.ts index 8f5a61e124..3580c04f97 100644 --- a/demo-shell-ng2/app/vendor.ts +++ b/demo-shell-ng2/app/vendor.ts @@ -38,7 +38,6 @@ require('script-loader!dialog-polyfill/dialog-polyfill'); import 'dialog-polyfill/dialog-polyfill.css'; // Google Material Design Lite -import 'material-design-icons/iconfont/material-icons.css'; import 'material-design-lite/dist/material.orange-blue.min.css'; import 'material-design-lite/material.js'; diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html index bfddacb509..222f75ec7e 100644 --- a/demo-shell-ng2/index.html +++ b/demo-shell-ng2/index.html @@ -7,7 +7,7 @@ - +