chore(util): add removeArrayItem fn

ionic-team · Nov 29, 2016 · bdf02d4 · bdf02d4
1 parent a4ab7ca
commit bdf02d4
Show file tree

Hide file tree

Showing 7 changed files with 336 additions and 335 deletions.
diff --git a/src/components/menu/menu-controller.ts b/src/components/menu/menu-controller.ts
@@ -1,6 +1,7 @@
 import { Menu } from './menu';
 import { MenuType } from './menu-types';
 import { Platform } from '../../platform/platform';
+import { removeArrayItem } from '../../util/util';
 
 
 /**
@@ -291,10 +292,7 @@ export class MenuController {
    * @private
    */
   unregister(menu: Menu) {
-    let index = this._menus.indexOf(menu);
-    if (index > -1) {
-      this._menus.splice(index, 1);
-    }
+    removeArrayItem(this._menus, menu);
   }
 
   /**

diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts
@@ -8,7 +8,7 @@ import { convertToView, convertToViews, NavOptions, DIRECTION_BACK, DIRECTION_FO
 import { setZIndex } from './nav-util';
 import { DeepLinker } from './deep-linker';
 import { GestureController } from '../gestures/gesture-controller';
-import { isBlank, isNumber, isPresent, assert } from '../util/util';
+import { isBlank, isNumber, isPresent, assert, removeArrayItem } from '../util/util';
 import { isViewController, ViewController } from './view-controller';
 import { Ion } from '../components/ion';
 import { Keyboard } from '../util/keyboard';
@@ -893,10 +893,7 @@ export class NavControllerBase extends Ion implements NavController {
   }
 
   unregisterChildNav(nav: any) {
-    const index = this._children.indexOf(nav);
-    if (index > -1) {
-      this._children.splice(index, 1);
-    }
+    removeArrayItem(this._children, nav);
   }
 
   destroy() {

diff --git a/src/platform/platform.ts b/src/platform/platform.ts
@@ -2,6 +2,7 @@ import { EventEmitter, NgZone, OpaqueToken } from '@angular/core';
 
 import { QueryParams } from './query-params';
 import { ready, windowDimensions, flushDimensionCache } from '../util/dom';
+import { removeArrayItem } from '../util/util';
 
 
 /**
@@ -373,10 +374,7 @@ export class Platform {
 
     // return a function to unregister this back button action
     return () => {
-      let index = this._bbActions.indexOf(action);
-      if (index > -1) {
-        this._bbActions.splice(index, 1);
-      }
+      removeArrayItem(this._bbActions, action);
     };
   }
 
@@ -524,14 +522,11 @@ export class Platform {
    * @private
    */
   onResize(cb: Function): Function {
-    let self = this;
+    const self = this;
     self._onResizes.push(cb);
 
     return function() {
-      const index = self._onResizes.indexOf(cb);
-      if (index > -1) {
-        self._onResizes.splice(index, 1);
-      }
+      removeArrayItem(self._onResizes, cb);
     };
   }
 

diff --git a/src/util/dom.ts b/src/util/dom.ts
@@ -51,7 +51,7 @@ export function rafFrames(framesToWait: number, callback: Function) {
   if (framesToWait === 0) {
     callback();
 
-  }else if (framesToWait < 2) {
+  } else if (framesToWait < 2) {
     rafId = nativeRaf(callback);
 
   } else {

diff --git a/src/util/form.ts b/src/util/form.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { removeArrayItem } from './util';
 
 
 /**
@@ -15,10 +16,7 @@ export class Form {
   }
 
   deregister(input: any) {
-    let index = this._inputs.indexOf(input);
-    if (index > -1) {
-      this._inputs.splice(index, 1);
-    }
+    removeArrayItem(this._inputs, input);
     if (input === this._focused) {
       this._focused = null;
     }