Skip to content

Commit

Permalink
Feature: Update to ionic 5 and angular 9
Browse files Browse the repository at this point in the history
  • Loading branch information
Edy Avendaño committed Mar 8, 2020
1 parent 132061d commit fd6436d
Show file tree
Hide file tree
Showing 11 changed files with 5,976 additions and 2,690 deletions.
8,570 changes: 5,929 additions & 2,641 deletions package-lock.json

Large diffs are not rendered by default.

44 changes: 21 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "4.6.0",
"version": "4.7.0",
"name": "ionic-selectable",
"title": "Ionic Selectable",
"description": "An Ionic component similar to Ionic Select, that allows to search items, including async search, group, add, edit, delete items, and much more.",
Expand Down Expand Up @@ -32,34 +32,32 @@
"module": "ionic-selectable.js",
"types": "ionic-selectable.d.ts",
"peerDependencies": {
"@angular/core": ">=8.1.2",
"@ionic/angular": ">=4.11.3",
"rxjs": "~6.5.1",
"zone.js": "~0.9.1"
"@angular/core": ">=8.1.2"
},
"devDependencies": {
"@angular-devkit/architect": "~0.801.2",
"@angular-devkit/build-angular": "~0.801.2",
"@angular-devkit/core": "~8.1.2",
"@angular-devkit/schematics": "~8.1.2",
"@angular/cli": "~8.1.2",
"@angular/common": "~8.1.2",
"@angular/compiler": "~8.1.2",
"@angular/compiler-cli": "~8.1.2",
"@angular/core": "~8.1.2",
"@angular/forms": "~8.1.2",
"@angular/language-service": "~8.1.2",
"@angular/platform-browser": "~8.1.2",
"@angular/platform-browser-dynamic": "~8.1.2",
"@angular/router": "~8.1.2",
"@angular-devkit/build-angular": "~0.900.5",
"@angular-devkit/core": "~9.0.5",
"@angular-devkit/schematics": "~9.0.5",
"@angular/cli": "~9.0.5",
"@angular/common": "~9.0.5",
"@angular/compiler": "~9.0.5",
"@angular/compiler-cli": "~9.0.5",
"@angular/core": "~9.0.5",
"@angular/forms": "~9.0.5",
"@angular/language-service": "~9.0.5",
"@angular/platform-browser": "~9.0.5",
"@angular/platform-browser-dynamic": "~9.0.5",
"@angular/router": "~9.0.5",
"@ionic-native/core": "5.0.0-beta.15",
"@ionic-native/splash-screen": "5.0.0-beta.15",
"@ionic-native/status-bar": "5.0.0-beta.15",
"@ionic/angular": "~4.11.10",
"@ionic/angular": "~5.0.4",
"@ionic/angular-toolkit": "~2.0.0",
"@types/jasmine": "2.8.6",
"@types/jasminewd2": "2.0.3",
"@types/node": "10.9.2",
"@types/node": "13.9.0",
"codelyzer": "^5.0.0",
"cordova-android": "7.0.0",
"cordova-plugin-device": "^2.0.2",
Expand All @@ -74,7 +72,7 @@
"gulp-rename": "1.4.0",
"gulp-sass": "4.0.1",
"gulp-uglify-es": "1.0.4",
"ionicons": "4.5.5",
"ionicons": "~5.0.1",
"jasmine-core": "2.99.1",
"jasmine-spec-reporter": "4.2.1",
"karma": "3.0.0",
Expand All @@ -84,13 +82,13 @@
"karma-jasmine-html-reporter": "0.2.2",
"ng-packagr": "9.0.2",
"protractor": "5.4.0",
"rxjs": "~6.5.1",
"rxjs": "~6.5.4",
"sw-toolbox": "3.6.0",
"ts-node": "7.0.0",
"tsickle": "~0.35.0",
"tslint": "5.11.0",
"typescript": "~3.4.3",
"zone.js": "~0.9.1",
"typescript": "~3.7.5",
"zone.js": "~0.10.2",
"tslib": "^1.10.0"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import { IonicSelectableComponent } from './ionic-selectable.component';
templateUrl: './ionic-selectable-modal.component.html'
})
export class IonicSelectableModalComponent implements AfterViewInit {
@ViewChild(IonContent, { static: false })
@ViewChild(IonContent)
_content: IonContent;
_header: HTMLElement;
selectComponent: IonicSelectableComponent;
@ViewChild('searchbarComponent', { static: false })
@ViewChild('searchbarComponent')
_searchbarComponent: IonSearchbar;
@ViewChild(IonInfiniteScroll, { static: false })
@ViewChild(IonInfiniteScroll)
_infiniteScroll: IonInfiniteScroll;
@HostBinding('class.ionic-selectable-modal')
_cssClass = true;
Expand Down
30 changes: 15 additions & 15 deletions src/app/components/ionic-selectable/ionic-selectable.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -755,36 +755,36 @@ export class IonicSelectableComponent implements ControlValueAccessor, OnInit, D
@Output()
onAddItem: EventEmitter<{ component: IonicSelectableComponent }> = new EventEmitter();

@ContentChild(IonicSelectableValueTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableValueTemplateDirective, { read: TemplateRef })
valueTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableItemTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableItemTemplateDirective, { read: TemplateRef })
itemTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableItemEndTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableItemEndTemplateDirective, { read: TemplateRef })
itemEndTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableTitleTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableTitleTemplateDirective, { read: TemplateRef })
titleTemplate: TemplateRef<any>;
@ContentChild(IonicSelectablePlaceholderTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectablePlaceholderTemplateDirective, { read: TemplateRef })
placeholderTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableMessageTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableMessageTemplateDirective, { read: TemplateRef })
messageTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableGroupTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableGroupTemplateDirective, { read: TemplateRef })
groupTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableGroupEndTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableGroupEndTemplateDirective, { read: TemplateRef })
groupEndTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableCloseButtonTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableCloseButtonTemplateDirective, { read: TemplateRef })
closeButtonTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableSearchFailTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableSearchFailTemplateDirective, { read: TemplateRef })
searchFailTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableAddItemTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableAddItemTemplateDirective, { read: TemplateRef })
addItemTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableFooterTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableFooterTemplateDirective, { read: TemplateRef })
footerTemplate: TemplateRef<any>;
_addItemTemplateFooterHeight: string;
@ContentChild(IonicSelectableHeaderTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableHeaderTemplateDirective, { read: TemplateRef })
headerTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableItemIconTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableItemIconTemplateDirective, { read: TemplateRef })
itemIconTemplate: TemplateRef<any>;
@ContentChild(IonicSelectableIconTemplateDirective, { read: TemplateRef, static: false })
@ContentChild(IonicSelectableIconTemplateDirective, { read: TemplateRef })
iconTemplate: TemplateRef<any>;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class AddingOnSearchFailAsyncPage implements OnInit {
portNameControl: FormControl;
portCountryControl: FormControl;
portsSubscription: Subscription;
@ViewChild('portComponent', { static: false }) portComponent: IonicSelectableComponent;
@ViewChild('portComponent') portComponent: IonicSelectableComponent;

constructor(
private portService: PortService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class AddingOnSearchFailPage implements OnInit {
portForm: FormGroup;
portNameControl: FormControl;
portCountryControl: FormControl;
@ViewChild('portComponent', { static: false }) portComponent: IonicSelectableComponent;
@ViewChild('portComponent') portComponent: IonicSelectableComponent;

constructor(
private portService: PortService,
Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/disabling-items/disabling-items.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { Port } from '../../types';
styleUrls: ['./disabling-items.page.scss'],
})
export class DisablingItemsPage implements OnInit {
@ViewChild('loadingPortsComponent', { static: false }) loadingPortsComponent: IonicSelectableComponent;
@ViewChild('dischargingPortsComponent', { static: false }) dischargingPortsComponent: IonicSelectableComponent;
@ViewChild('loadingPortsComponent') loadingPortsComponent: IonicSelectableComponent;
@ViewChild('dischargingPortsComponent') dischargingPortsComponent: IonicSelectableComponent;
ports: Port[];
loadingPorts: Port[] = [];
dischargingPorts: Port[] = [];
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/editing-async/editing-async.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class EditingAsyncPage implements OnInit {
portNameControl: FormControl;
portCountryControl: FormControl;
portsSubscription: Subscription;
@ViewChild('portComponent', { static: false }) portComponent: IonicSelectableComponent;
@ViewChild('portComponent') portComponent: IonicSelectableComponent;

constructor(
private portService: PortService,
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/editing/editing.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class EditingPage implements OnInit {
portForm: FormGroup;
portNameControl: FormControl;
portCountryControl: FormControl;
@ViewChild('portComponent', { static: false }) portComponent: IonicSelectableComponent;
@ViewChild('portComponent') portComponent: IonicSelectableComponent;

constructor(
private portService: PortService,
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/footer-template/footer-template.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class FooterTemplatePage implements OnInit {
ports: Port[];
countries: Country[];
port: Port;
@ViewChild('portComponent', { static: false }) portComponent: IonicSelectableComponent;
@ViewChild('portComponent') portComponent: IonicSelectableComponent;
portForm: FormGroup;
portNameControl: FormControl;
portCountryControl: FormControl;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/scroll-to-top/scroll-to-top.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Port } from '../../types';
export class ScrollToTopPage implements OnInit {
ports: Port[];
port: Port;
@ViewChild('portComponent', { static: false }) portComponent: IonicSelectableComponent;
@ViewChild('portComponent') portComponent: IonicSelectableComponent;

constructor(
private portService: PortService
Expand Down

0 comments on commit fd6436d

Please sign in to comment.