fix(loading): improvements condition dismiss()

ramonornela · ramonornela · commit 8a367679b0df · 2016-12-11T17:35:30.000-02:00
diff --git a/src/providers/loading-ionic.ts b/src/providers/loading-ionic.ts
@@ -52,27 +52,22 @@ export class LoadingIonicPlugin extends PluginBase implements PreRequestPlugin,
   }
 
   dismiss() {
-    if (this.allow) {
+    if (this.loading) {
       this.loading.dismissAll();
     }
 
     this.loading = null;
+    this.restoreOptions();
   }
 
   postRequest() {
-    if (this.loading !== null && this.skippedCount === null) {
+    if (this.skippedCount === null) {
       this.dismiss();
     }
-
-    this.restoreOptions();
   }
 
   postRequestError() {
-    if (this.loading !== null) {
-      this.dismiss();
-    }
-
-    this.restoreOptions();
+    this.dismiss();
   }
 
   disableLoading(skip?: boolean | number): this {

Original file line number	Diff line number	Diff line change
`@@ -52,27 +52,22 @@ export class LoadingIonicPlugin extends PluginBase implements PreRequestPlugin,`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`dismiss() {`
`55`		`- if (this.allow) {`
	`55`	`+ if (this.loading) {`
`56`	`56`	`this.loading.dismissAll();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`this.loading = null;`
	`60`	`+ this.restoreOptions();`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`postRequest() {`
`63`		`- if (this.loading !== null && this.skippedCount === null) {`
	`64`	`+ if (this.skippedCount === null) {`
`64`	`65`	`this.dismiss();`
`65`	`66`	`}`
`66`		`-`
`67`		`- this.restoreOptions();`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`postRequestError() {`
`71`		`- if (this.loading !== null) {`
`72`		`- this.dismiss();`
`73`		`- }`
`74`		`-`
`75`		`- this.restoreOptions();`
	`70`	`+ this.dismiss();`
`76`	`71`	`}`
`77`	`72`
`78`	`73`	`disableLoading(skip?: boolean \| number): this {`