Skip to content

Commit 35568ba

Browse files
manucorporatadamdbradley
manucorporat
authored and
adamdbradley
committed
chore: removed deprecated APIs
1 parent a06bd69 commit 35568ba

File tree

11 files changed

+22
-190
lines changed

11 files changed

+22
-190
lines changed

‎src/components/action-sheet/action-sheet.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,6 @@ export class ActionSheet extends ViewController {
6161
return this._app.present(this, navOptions);
6262
}
6363

64-
/**
65-
* @private
66-
* DEPRECATED: Please inject ActionSheetController instead
67-
*/
68-
static create(opt: any) {
69-
// deprecated warning: added beta.11 2016-06-27
70-
console.warn('ActionSheet.create(..) has been deprecated. Please inject ActionSheetController instead');
71-
}
72-
7364
}
7465

7566

‎src/components/alert/alert.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@ export class Alert extends ViewController {
8484
return this._app.present(this, navOptions);
8585
}
8686

87-
/**
88-
* @private
89-
* DEPRECATED: Please inject AlertController instead
90-
*/
91-
static create(opt: any) {
92-
// deprecated warning: added beta.11 2016-06-27
93-
console.warn('Alert.create(..) has been deprecated. Please inject AlertController instead');
94-
}
95-
9687
}
9788

9889

‎src/components/loading/loading.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ export class Loading extends ViewController {
5555
this._nav && this._nav.popAll();
5656
}
5757

58-
/**
59-
* @private
60-
* DEPRECATED: Please inject LoadingController instead
61-
*/
62-
static create(opt: any) {
63-
// deprecated warning: added beta.11 2016-06-27
64-
console.warn('Loading.create(..) has been deprecated. Please inject LoadingController instead');
65-
}
66-
6758
}
6859

6960

‎src/components/modal/modal.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ export class Modal extends ViewController {
4444
return this._app.present(this, navOptions, AppPortal.MODAL);
4545
}
4646

47-
/**
48-
* @private
49-
* DEPRECATED: Please inject ModalController instead
50-
*/
51-
static create(cmp: any, opt: any) {
52-
// deprecated warning: added beta.11 2016-06-27
53-
console.warn('Modal.create(..) has been deprecated. Please inject ModalController instead');
54-
}
5547
}
5648

5749

‎src/components/picker/picker.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,6 @@ export class Picker extends ViewController {
7474
return this._app.present(this, navOptions);
7575
}
7676

77-
/**
78-
* @private
79-
* DEPRECATED: Please inject PickerController instead
80-
*/
81-
static create(opt: any) {
82-
// deprecated warning: added beta.11 2016-06-27
83-
console.warn('Picker.create(..) has been deprecated. Please inject PickerController instead');
84-
}
85-
8677
}
8778

8879

‎src/components/popover/popover.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,6 @@ export class Popover extends ViewController {
4343
return this._app.present(this, navOptions);
4444
}
4545

46-
/**
47-
* @private
48-
* DEPRECATED: Please inject PopoverController instead
49-
*/
50-
static create(component: any, data = {}, opts: PopoverOptions = {}) {
51-
// deprecated warning: added beta.11 2016-06-27
52-
console.warn('Popover.create(..) has been deprecated. Please inject PopoverController instead');
53-
}
54-
5546
}
5647

5748

‎src/components/tabs/tab-button.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ export class TabButton extends Ion implements OnInit {
3939

4040
this.disHover = (config.get('hoverCSS') === false);
4141
this.layout = config.get('tabsLayout');
42-
43-
// TODO deprecated 07-07-2016 beta.11
44-
if (config.get('tabbarLayout') !== undefined) {
45-
this.layout = config.get('tabbarLayout');
46-
}
4742
}
4843

4944
ngOnInit() {

‎src/components/tabs/tabs.ts‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -192,21 +192,11 @@ export class Tabs extends Ion implements AfterViewInit {
192192
*/
193193
@Input() selectedIndex: number;
194194

195-
/**
196-
* @internal DEPRECATED. Please use `tabsLayout` instead.
197-
*/
198-
@Input() private tabbarLayout: string;
199-
200195
/**
201196
* @input {string} Set the tabbar layout: `icon-top`, `icon-left`, `icon-right`, `icon-bottom`, `icon-hide`, `title-hide`.
202197
*/
203198
@Input() tabsLayout: string;
204199

205-
/**
206-
* @internal DEPRECATED. Please use `tabsPlacement` instead.
207-
*/
208-
@Input() private tabbarPlacement: string;
209-
210200
/**
211201
* @input {string} Set position of the tabbar: `top`, `bottom`.
212202
*/
@@ -261,18 +251,6 @@ export class Tabs extends Ion implements AfterViewInit {
261251
this._subPages = config.getBoolean('tabsHideOnSubPages');
262252
this.tabsHighlight = config.getBoolean('tabsHighlight');
263253

264-
// TODO deprecated 07-07-2016 beta.11
265-
if (config.get('tabSubPages') !== null) {
266-
console.warn('Config option "tabSubPages" has been deprecated. Please use "tabsHideOnSubPages" instead.');
267-
this._subPages = config.getBoolean('tabSubPages');
268-
}
269-
270-
// TODO deprecated 07-07-2016 beta.11
271-
if (config.get('tabbarHighlight') !== null) {
272-
console.warn('Config option "tabbarHighlight" has been deprecated. Please use "tabsHighlight" instead.');
273-
this.tabsHighlight = config.getBoolean('tabbarHighlight');
274-
}
275-
276254
if (this.parent) {
277255
// this Tabs has a parent Nav
278256
this.parent.registerChildNav(this);
@@ -308,36 +286,6 @@ export class Tabs extends Ion implements AfterViewInit {
308286
this._setConfig('tabsLayout', 'icon-top');
309287
this._setConfig('tabsHighlight', this.tabsHighlight);
310288

311-
// TODO deprecated 07-07-2016 beta.11
312-
this._setConfig('tabbarPlacement', 'bottom');
313-
this._setConfig('tabbarLayout', 'icon-top');
314-
315-
// TODO deprecated 07-07-2016 beta.11
316-
if (this.tabbarPlacement !== undefined) {
317-
console.warn('Input "tabbarPlacement" has been deprecated. Please use "tabsPlacement" instead.');
318-
this.setElementAttribute('tabsPlacement', this.tabbarPlacement);
319-
this.tabsPlacement = this.tabbarPlacement;
320-
}
321-
322-
// TODO deprecated 07-07-2016 beta.11
323-
if (this._config.get('tabbarPlacement') !== null) {
324-
console.warn('Config option "tabbarPlacement" has been deprecated. Please use "tabsPlacement" instead.');
325-
this.setElementAttribute('tabsPlacement', this._config.get('tabbarPlacement'));
326-
}
327-
328-
// TODO deprecated 07-07-2016 beta.11
329-
if (this.tabbarLayout !== undefined) {
330-
console.warn('Input "tabbarLayout" has been deprecated. Please use "tabsLayout" instead.');
331-
this.setElementAttribute('tabsLayout', this.tabbarLayout);
332-
this.tabsLayout = this.tabbarLayout;
333-
}
334-
335-
// TODO deprecated 07-07-2016 beta.11
336-
if (this._config.get('tabbarLayout') !== null) {
337-
console.warn('Config option "tabbarLayout" has been deprecated. Please use "tabsLayout" instead.');
338-
this.setElementAttribute('tabsLayout', this._config.get('tabsLayout'));
339-
}
340-
341289
if (this.tabsHighlight) {
342290
this._platform.onResize(() => {
343291
this._highlight.select(this.getSelected());

‎src/components/toast/toast.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,6 @@ export class Toast extends ViewController {
6666
this._nav && this._nav.popAll();
6767
}
6868

69-
/**
70-
* @private
71-
* DEPRECATED: Please inject ToastController instead
72-
*/
73-
static create(opt: any) {
74-
// deprecated warning: added beta.11 2016-06-27
75-
console.warn('Toast.create(..) has been deprecated. Please inject ToastController instead');
76-
}
77-
7869
}
7970

8071

‎src/navigation/nav-controller-base.ts‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,9 @@ export class NavControllerBase extends Ion implements NavController {
883883
}
884884

885885
isTransitioning(): boolean {
886+
if (this._trnsTm === 0) {
887+
return false;
888+
}
886889
// using a timestamp instead of boolean incase something goes wrong
887890
return (this._trnsTm > Date.now());
888891
}
@@ -954,28 +957,6 @@ export class NavControllerBase extends Ion implements NavController {
954957
this._viewport = val;
955958
}
956959

957-
958-
/**
959-
* @private
960-
* DEPRECATED: Please use app.getRootNav() instead
961-
*/
962-
get rootNav(): NavController {
963-
// deprecated 07-14-2016 beta.11
964-
console.warn('nav.rootNav() has been deprecated, please use app.getRootNav() instead');
965-
return this._app.getRootNav();
966-
}
967-
968-
/**
969-
* @private
970-
* DEPRECATED: Please use inject the overlays controller and use the present method on the instance instead.
971-
*/
972-
present(): Promise<any> {
973-
// deprecated warning: added beta.11 2016-06-27
974-
console.warn('nav.present() has been deprecated.\n' +
975-
'Please inject the overlay\'s controller and use the present method on the instance instead.');
976-
return Promise.resolve();
977-
}
978-
979960
}
980961

981962
let ctrlIds = -1;

0 commit comments

Comments
 (0)