mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
refactor(icon): remove unused arguments (#1987)
As per the discussion #1539, there are a few places in the icon registry where the config is being passed without actually being used. This change removes those instances and does some minor cleanup. Fixes #1539.
This commit is contained in:
committed by
tinayuangao
parent
e74babccc1
commit
3ed76f5fde
@@ -287,7 +287,7 @@ export class MdIconRegistry {
|
||||
for (let i = iconSetConfigs.length - 1; i >= 0; i--) {
|
||||
const config = iconSetConfigs[i];
|
||||
if (config.svgElement) {
|
||||
const foundIcon = this._extractSvgIconFromSet(config.svgElement, iconName, config);
|
||||
const foundIcon = this._extractSvgIconFromSet(config.svgElement, iconName);
|
||||
if (foundIcon) {
|
||||
return foundIcon;
|
||||
}
|
||||
@@ -302,7 +302,7 @@ export class MdIconRegistry {
|
||||
*/
|
||||
private _loadSvgIconFromConfig(config: SvgIconConfig): Observable<SVGElement> {
|
||||
return this._fetchUrl(config.url)
|
||||
.map(svgText => this._createSvgElementForSingleIcon(svgText, config));
|
||||
.map(svgText => this._createSvgElementForSingleIcon(svgText));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -318,9 +318,9 @@ export class MdIconRegistry {
|
||||
/**
|
||||
* Creates a DOM element from the given SVG string, and adds default attributes.
|
||||
*/
|
||||
private _createSvgElementForSingleIcon(responseText: string, config: SvgIconConfig): SVGElement {
|
||||
private _createSvgElementForSingleIcon(responseText: string): SVGElement {
|
||||
const svg = this._svgElementFromString(responseText);
|
||||
this._setSvgAttributes(svg, config);
|
||||
this._setSvgAttributes(svg);
|
||||
return svg;
|
||||
}
|
||||
|
||||
@@ -329,8 +329,7 @@ export class MdIconRegistry {
|
||||
* tag matches the specified name. If found, copies the nested element to a new SVG element and
|
||||
* returns it. Returns null if no matching element is found.
|
||||
*/
|
||||
private _extractSvgIconFromSet(
|
||||
iconSet: SVGElement, iconName: string, config: SvgIconConfig): SVGElement {
|
||||
private _extractSvgIconFromSet(iconSet: SVGElement, iconName: string): SVGElement {
|
||||
const iconNode = iconSet.querySelector('#' + iconName);
|
||||
if (!iconNode) {
|
||||
return null;
|
||||
@@ -338,7 +337,7 @@ export class MdIconRegistry {
|
||||
// If the icon node is itself an <svg> node, clone and return it directly. If not, set it as
|
||||
// the content of a new <svg> node.
|
||||
if (iconNode.tagName.toLowerCase() == 'svg') {
|
||||
return this._setSvgAttributes(<SVGElement>iconNode.cloneNode(true), config);
|
||||
return this._setSvgAttributes(iconNode.cloneNode(true) as SVGElement);
|
||||
}
|
||||
// createElement('SVG') doesn't work as expected; the DOM ends up with
|
||||
// the correct nodes, but the SVG content doesn't render. Instead we
|
||||
@@ -348,7 +347,7 @@ export class MdIconRegistry {
|
||||
const svg = this._svgElementFromString('<svg></svg>');
|
||||
// Clone the node so we don't remove it from the parent icon set element.
|
||||
svg.appendChild(iconNode.cloneNode(true));
|
||||
return this._setSvgAttributes(svg, config);
|
||||
return this._setSvgAttributes(svg);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -359,7 +358,7 @@ export class MdIconRegistry {
|
||||
// creating an element from an HTML string.
|
||||
const div = document.createElement('DIV');
|
||||
div.innerHTML = str;
|
||||
const svg = <SVGElement>div.querySelector('svg');
|
||||
const svg = div.querySelector('svg') as SVGElement;
|
||||
if (!svg) {
|
||||
throw new MdIconSvgTagNotFoundError();
|
||||
}
|
||||
@@ -369,7 +368,7 @@ export class MdIconRegistry {
|
||||
/**
|
||||
* Sets the default attributes for an SVG element to be used as an icon.
|
||||
*/
|
||||
private _setSvgAttributes(svg: SVGElement, config: SvgIconConfig): SVGElement {
|
||||
private _setSvgAttributes(svg: SVGElement): SVGElement {
|
||||
if (!svg.getAttribute('xmlns')) {
|
||||
svg.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
|
||||
}
|
||||
@@ -410,6 +409,6 @@ export class MdIconRegistry {
|
||||
|
||||
|
||||
/** Clones an SVGElement while preserving type information. */
|
||||
function cloneSvg(svg: SVGElement) {
|
||||
return <SVGElement> svg.cloneNode(true);
|
||||
function cloneSvg(svg: SVGElement): SVGElement {
|
||||
return svg.cloneNode(true) as SVGElement;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user