From da4983a16133ee7d85f3393161d16fe1a33d2fa4 Mon Sep 17 00:00:00 2001 From: Amit Moryossef Date: Thu, 20 Apr 2017 16:09:18 +0300 Subject: [PATCH] revert(renderer): back to renderer1 --- src/components/backdrop/backdrop.ts | 12 ++++-------- src/components/menu/menu.ts | 16 ++++------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/components/backdrop/backdrop.ts b/src/components/backdrop/backdrop.ts index 552e648e38..8a4b239add 100644 --- a/src/components/backdrop/backdrop.ts +++ b/src/components/backdrop/backdrop.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, Renderer2 } from '@angular/core'; +import { Directive, ElementRef, Renderer } from '@angular/core'; /** * @hidden @@ -14,8 +14,8 @@ import { Directive, ElementRef, Renderer2 } from '@angular/core'; export class Backdrop { constructor( - private _elementRef: ElementRef, - private _renderer: Renderer2 + private _elementRef: ElementRef, + private _renderer: Renderer ) { } getNativeElement(): HTMLElement { @@ -23,11 +23,7 @@ export class Backdrop { } setElementClass(className: string, add: boolean) { - if (add) { - this._renderer.addClass(this._elementRef.nativeElement, className); - } else { - this._renderer.removeClass(this._elementRef.nativeElement, className); - } + this._renderer.setElementClass(this._elementRef.nativeElement, className, add); } } diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts index b5e9370038..995af9fbb5 100644 --- a/src/components/menu/menu.ts +++ b/src/components/menu/menu.ts @@ -1,8 +1,4 @@ -import { - ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, forwardRef, Input, - OnInit, OnChanges, OnDestroy, - Output, Renderer2, SimpleChange, ViewChild, ViewEncapsulation -} from '@angular/core'; +import { OnInit, OnChanges, OnDestroy, SimpleChange, ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, forwardRef, Input, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core'; import { App } from '../app/app'; import { Backdrop } from '../backdrop/backdrop'; @@ -315,7 +311,7 @@ export class Menu implements RootNode, OnInit, OnChanges, OnDestroy { private _elementRef: ElementRef, private _config: Config, private _plt: Platform, - private _renderer: Renderer2, + private _renderer: Renderer, private _keyboard: Keyboard, private _gestureCtrl: GestureController, private _domCtrl: DomController, @@ -704,18 +700,14 @@ export class Menu implements RootNode, OnInit, OnChanges, OnDestroy { * @hidden */ setElementClass(className: string, add: boolean) { - if (add) { - this._renderer.addClass(this._elementRef.nativeElement, className); - } else { - this._renderer.removeClass(this._elementRef.nativeElement, className); - } + this._renderer.setElementClass(this._elementRef.nativeElement, className, add); } /** * @hidden */ setElementAttribute(attributeName: string, value: string) { - this._renderer.setAttribute(this._elementRef.nativeElement, attributeName, value); + this._renderer.setElementAttribute(this._elementRef.nativeElement, attributeName, value); } /**