Skip to content

[JS] use let to replace var in for loop #6465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwoo-msft merged 3 commits into from
Oct 1, 2021
Merged

[JS] use let to replace var in for loop #6465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd6743d
var to let
licanhua Sep 30, 2021
75ae6e1
Merge branch 'main' into canhua/let
licanhua Oct 1, 2021
4c4ec80
Merge branch 'main' into canhua/let
licanhua Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/nodejs/ac-typed-schema/src/SchemaClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class SchemaClass extends SchemaType {
super(sourceObj);

if (sourceObj.properties) {
for (var key in sourceObj.properties) {
for (let key in sourceObj.properties) {
this._properties.set(key, new SchemaProperty(key, sourceObj.properties[key]));
}
}
Expand Down
6 changes: 3 additions & 3 deletions source/nodejs/ac-typed-schema/src/markdown/build-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function buildModel(options: BuildModelOptions) {

var schema: Schema = Schema.fromFolder(schemaFolder);

for (var index in toc) {
for (let index in toc) {
var rootObj = toc[index];

var root = {
Expand All @@ -36,7 +36,7 @@ export function buildModel(options: BuildModelOptions) {
schema: schema
};

for (var definitionIndex in rootObj[root.title]) {
for (let definitionIndex in rootObj[root.title]) {

var name = rootObj[root.title][definitionIndex];
var objSchema = schema.getType(name);
Expand Down Expand Up @@ -86,6 +86,6 @@ export function buildModel(options: BuildModelOptions) {
}

function getObjectName(obj) {
for (var property in obj)
for (let property in obj)
return property;
}
8 changes: 4 additions & 4 deletions source/nodejs/ac-typed-schema/src/markdown/generate-markdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ function createTable(formattedProperties: any[]) {
*/
var tableData = [];
var headerRow = [];
for (var propName in formattedProperties[0]) {
for (let propName in formattedProperties[0]) {
headerRow.push(__(propName));
}
tableData.push(headerRow);

formattedProperties.forEach((formattedProperty) => {
var dataRow = [];
for (var propName in formattedProperty) {
for (let propName in formattedProperty) {
dataRow.push(formattedProperty[propName]);
}
tableData.push(dataRow);
Expand Down Expand Up @@ -222,14 +222,14 @@ export function createEnumSummary(enumType: SchemaEnum) {
*/
var tableData = [];
var headerRow = [];
for (var propName in rows[0]) {
for (let propName in rows[0]) {
headerRow.push(propName);
}
tableData.push(headerRow);

rows.forEach((row) => {
var dataRow = [];
for (var propName in row) {
for (let propName in row) {
dataRow.push(row[propName]);
}
tableData.push(dataRow);
Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/ac-typed-schema/src/markdown/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function getHeaderMarkdown(content, level) {
level = defaultValueHelper(level, 2);

var md = '';
for (var i = 0; i < level; ++i) {
for (let i = 0; i < level; ++i) {
md += '#';
}

Expand Down
8 changes: 4 additions & 4 deletions source/nodejs/ac-typed-schema/src/typed-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function isObjectEmpty(obj: any) {
if (!obj) {
return true;
}
for (var key in obj) {
for (let key in obj) {
return false;
}
return true;
Expand Down Expand Up @@ -114,7 +114,7 @@ class Transformer {
}

if (!isObjectEmpty(this._implementationsOf)) {
for (var key in this._implementationsOf) {
for (let key in this._implementationsOf) {

var anyOfValue = [];

Expand All @@ -136,7 +136,7 @@ class Transformer {
}

if (!isObjectEmpty(this._extendables)) {
for (var key in this._extendables) {
for (let key in this._extendables) {
answer.definitions["Extendable." + key] = this._extendables[key];
}
}
Expand Down Expand Up @@ -358,7 +358,7 @@ class Transformer {

private toCaseInsensitiveRegex(enumValue: string) {
var answer = "";
for (var i = 0; i < enumValue.length; i++) {
for (let i = 0; i < enumValue.length; i++) {
var c = enumValue.charAt(i);
answer += `[${c.toLowerCase()}|${c.toUpperCase()}]`;
}
Expand Down
6 changes: 3 additions & 3 deletions source/nodejs/adaptivecards-controls/src/calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export class Calendar extends InputControl {

private initializeSelection() {
if (this._date) {
for (var i = 0; i < this._days.length; i++) {
for (let i = 0; i < this._days.length; i++) {
if (Utils.areDatesEqual(this._days[i].date, this.date)) {
this.selectedDayCell = this._days[i];

Expand All @@ -173,7 +173,7 @@ export class Calendar extends InputControl {

var dayIndex = <number>Utils.CalendarSettings.firstDayOfWeek;

for (var i = 0; i < Utils.CalendarSettings.daysInWeek; i++) {
for (let i = 0; i < Utils.CalendarSettings.daysInWeek; i++) {
var cell = document.createElement("td");
cell.className = "ms-ctrl ms-ctrl-calendarDayHeader";
cell.innerText = Utils.CalendarSettings.getInitialDayName(dayIndex);
Expand All @@ -189,7 +189,7 @@ export class Calendar extends InputControl {

this._miniCalendarElement.appendChild(row);

for (var i = 0; i < this._days.length; i++) {
for (let i = 0; i < this._days.length; i++) {
if (i % 7 == 0) {
row = document.createElement("tr");
this._miniCalendarElement.appendChild(row);
Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/adaptivecards-controls/src/dropdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class DropDownPopupControl extends PopupControl {

var selectedIndex = this._owner.selectedIndex;

for (var i = 0; i < this._owner.items.length; i++) {
for (let i = 0; i < this._owner.items.length; i++) {
var renderedItem = this._owner.items.get(i).render();
renderedItem.tabIndex = 0;

Expand Down Expand Up @@ -212,7 +212,7 @@ export class DropDown extends InputWithPopup<DropDownPopupControl, DropDownItem>
attach(rootElement: HTMLElement) {
super.attach(rootElement);

for (var i = 0; i < this.rootElement.children.length; i++) {
for (let i = 0; i < this.rootElement.children.length; i++) {
var childElement = this.rootElement.children[i];

if (childElement.tagName.toLowerCase() == "ms-dropdown-item") {
Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/adaptivecards-controls/src/popupmenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class PopupMenu extends PopupControl {
element.className = "ms-ctrl ms-popup";
element.setAttribute("role", "listbox");

for (var i = 0; i < this._items.length; i++) {
for (let i = 0; i < this._items.length; i++) {
var renderedItem = this._items.get(i).render();
renderedItem.tabIndex = 0;

Expand Down
14 changes: 7 additions & 7 deletions source/nodejs/adaptivecards-designer/src/card-designer-surface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export abstract class DesignerPeerRegistry<TSource, TPeer> {
}

findTypeRegistration(sourceType: TSource): DesignerPeers.DesignerPeerRegistration<TSource, TPeer> {
for (var i = 0; i < this._items.length; i++) {
for (let i = 0; i < this._items.length; i++) {
if (this._items[i].sourceType === sourceType) {
return this._items[i];
}
Expand All @@ -87,7 +87,7 @@ export abstract class DesignerPeerRegistry<TSource, TPeer> {
}

unregisterPeer(sourceType: TSource) {
for (var i = 0; i < this._items.length; i++) {
for (let i = 0; i < this._items.length; i++) {
if (this._items[i].sourceType === sourceType) {
this._items.splice(i, 1);

Expand Down Expand Up @@ -372,7 +372,7 @@ export class CardDesignerSurface {

peer.addElementsToDesignerSurface(this._designerSurface);

for (var i = 0; i < peer.getChildCount(); i++) {
for (let i = 0; i < peer.getChildCount(); i++) {
this.addPeer(peer.getChildAt(i));
}
}
Expand All @@ -399,7 +399,7 @@ export class CardDesignerSurface {
result = currentPeer;
}

for (var i = 0; i < currentPeer.getChildCount(); i++) {
for (let i = 0; i < currentPeer.getChildCount(); i++) {
var deeperResult = this.internalFindDropTarget(pointerPosition, currentPeer.getChildAt(i), forPeer);

if (deeperResult) {
Expand All @@ -414,7 +414,7 @@ export class CardDesignerSurface {
}

private findCardElementPeer(cardElement: Adaptive.CardElement): DesignerPeers.CardElementPeer {
for (var i = 0; i < this._allPeers.length; i++) {
for (let i = 0; i < this._allPeers.length; i++) {
var peer = this._allPeers[i];

if (peer instanceof DesignerPeers.CardElementPeer && peer.cardElement == cardElement) {
Expand All @@ -426,7 +426,7 @@ export class CardDesignerSurface {
}

private findActionPeer(action: Adaptive.Action): DesignerPeers.ActionPeer {
for (var i = 0; i < this._allPeers.length; i++) {
for (let i = 0; i < this._allPeers.length; i++) {
var peer = this._allPeers[i];

if (peer instanceof DesignerPeers.ActionPeer && peer.action == action) {
Expand Down Expand Up @@ -730,7 +730,7 @@ export class CardDesignerSurface {

updateLayout(isFullRefresh: boolean = true) {
if (!this.isPreviewMode) {
for (var i = 0; i < this._allPeers.length; i++) {
for (let i = 0; i < this._allPeers.length; i++) {
this._allPeers[i].updateLayout();
}

Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/adaptivecards-designer/src/card-designer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export class CardDesigner extends Designer.DesignContext {
let paletteItemContainer = document.createElement('div');
paletteItemContainer.className = "acd-palette-item-container";

for (var i = 0; i < categorizedTypes[category].length; i++) {
for (let i = 0; i < categorizedTypes[category].length; i++) {
this.addPaletteItem(categorizedTypes[category][i], paletteItemContainer);
}

Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/adaptivecards-designer/src/containers/outlook/outlook-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class OutlookContainer extends HostContainer {
if (typeof source["resources"] === "object") {
var actionResources = source["resources"]["actions"] as Array<any>;

for (var i = 0; i < actionResources.length; i++) {
for (let i = 0; i < actionResources.length; i++) {
let action = this.actionsRegistry.createInstance(actionResources[i]["type"], context.targetVersion);

if (action) {
Expand Down Expand Up @@ -105,7 +105,7 @@ export class OutlookContainer extends HostContainer {
if (rootCard) {
var actionArray = rootCard["resources"]["actions"] as Array<Adaptive.Action>;

for (var i = 0; i < actionArray.length; i++) {
for (let i = 0; i < actionArray.length; i++) {
if (actionArray[i].id == actionId) {
actionArray[i].execute();

Expand Down
16 changes: 8 additions & 8 deletions source/nodejs/adaptivecards-designer/src/designer-peers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ export class ActionPropertyEditor extends SingleInputPropertyEditor {
input.placeholder = "(not set)";
input.choices.push(new Adaptive.Choice("(not set)", "none"));

for (var i = 0; i < context.designContext.hostContainer.actionsRegistry.getItemCount(); i++) {
for (let i = 0; i < context.designContext.hostContainer.actionsRegistry.getItemCount(); i++) {
let actionType = context.designContext.hostContainer.actionsRegistry.getItemAt(i).typeName;
let excludeAction = true;

Expand Down Expand Up @@ -1274,7 +1274,7 @@ export abstract class DesignerPeer extends DraggableElement {
designerSurface.appendChild(this.renderedElement);

if (processChildren) {
for (var i = 0; i < this.getChildCount(); i++) {
for (let i = 0; i < this.getChildCount(); i++) {
this.getChildAt(i).addElementsToDesignerSurface(designerSurface, processChildren);
}
}
Expand All @@ -1284,7 +1284,7 @@ export abstract class DesignerPeer extends DraggableElement {
this.renderedElement.parentNode.removeChild(this.renderedElement);

if (processChildren) {
for (var i = 0; i < this.getChildCount(); i++) {
for (let i = 0; i < this.getChildCount(); i++) {
this.getChildAt(i).removeElementsFromDesignerSurface(processChildren);
}
}
Expand Down Expand Up @@ -1685,7 +1685,7 @@ export class CardElementPeer extends DesignerPeer {
let itemCount = 0;
if (this.cardElement instanceof Adaptive.CardElementContainer) {
itemCount = this.cardElement.getItemCount();
for (var i = 0; i < itemCount; i++) {
for (let i = 0; i < itemCount; i++) {
let existingPeer = this.findCardElementChild(this.cardElement.getItemAt(i));

if (!existingPeer) {
Expand All @@ -1700,7 +1700,7 @@ export class CardElementPeer extends DesignerPeer {
}
}

for (var i = 0; i < this.cardElement.getActionCount(); i++) {
for (let i = 0; i < this.cardElement.getActionCount(); i++) {
let existingPeer = this.findActionChild(this.cardElement.getActionAt(i));

if (!existingPeer) {
Expand Down Expand Up @@ -1746,7 +1746,7 @@ export class CardElementPeer extends DesignerPeer {
let targetChild: DesignerPeer = null;
let insertAfter: boolean;

for (var i = 0; i < this.getChildCount(); i++) {
for (let i = 0; i < this.getChildCount(); i++) {
let rect = this.getChildAt(i).getBoundingRect();

if (rect.isInside(insertionPoint)) {
Expand Down Expand Up @@ -1924,7 +1924,7 @@ export class AdaptiveCardPeer extends TypedCardElementPeer<Adaptive.AdaptiveCard

let availableActions: Adaptive.ITypeRegistration<Adaptive.Action>[] = [];

for (var i = 0; i < context.hostContainer.actionsRegistry.getItemCount(); i++) {
for (let i = 0; i < context.hostContainer.actionsRegistry.getItemCount(); i++) {
let typeRegistration = context.hostContainer.actionsRegistry.getItemAt(i);

if (typeRegistration.schemaVersion.compareTo(context.targetVersion) <= 0) {
Expand Down Expand Up @@ -2250,7 +2250,7 @@ export class ActionSetPeer extends TypedCardElementPeer<Adaptive.AdaptiveCard> {

let availableActions: Adaptive.ITypeRegistration<Adaptive.Action>[] = [];

for (var i = 0; i < context.hostContainer.actionsRegistry.getItemCount(); i++) {
for (let i = 0; i < context.hostContainer.actionsRegistry.getItemCount(); i++) {
let typeRegistration = context.hostContainer.actionsRegistry.getItemAt(i);

if (typeRegistration.schemaVersion.compareTo(context.targetVersion) <= 0) {
Expand Down
6 changes: 3 additions & 3 deletions source/nodejs/adaptivecards-visualizer/src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ function setupContainerPicker() {

hostContainerPicker.addEventListener("change", hostContainerPickerChanged);

for (var i = 0; i < hostContainerOptions.length; i++) {
for (let i = 0; i < hostContainerOptions.length; i++) {
var option = document.createElement("option");
option.value = hostContainerOptions[i].name;
option.text = hostContainerOptions[i].name;
Expand Down Expand Up @@ -234,7 +234,7 @@ function actionExecuted(action: Adaptive.Action) {
message += " Method: " + httpAction.method + "\n";
message += " Headers:\n";

for (var i = 0; i < httpAction.headers.length; i++) {
for (let i = 0; i < httpAction.headers.length; i++) {
message += " " + httpAction.headers[i].name + ": " + httpAction.headers[i].value + "\n";
}

Expand Down Expand Up @@ -282,7 +282,7 @@ function showValidationErrors() {
var errorContainer = document.getElementById("errorContainer");
errorContainer.innerHTML = "";

for (var i = 0; i < lastValidationErrors.length; i++) {
for (let i = 0; i < lastValidationErrors.length; i++) {
var errorElement = document.createElement("div");
errorElement.innerText = lastValidationErrors[i].message;

Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/adaptivecards-visualizer/src/containers/outlook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class OutlookContainer extends HostContainer {
if (typeof source["resources"] === "object") {
var actionResources = source["resources"]["actions"] as Array<any>;

for (var i = 0; i < actionResources.length; i++) {
for (let i = 0; i < actionResources.length; i++) {
let action = Adaptive.GlobalRegistry.actions.createInstance(actionResources[i]["type"], context.targetVersion);

if (action) {
Expand Down Expand Up @@ -108,7 +108,7 @@ export class OutlookContainer extends HostContainer {
if (rootCard) {
var actionArray = rootCard["resources"]["actions"] as Array<Adaptive.Action>;

for (var i = 0; i < actionArray.length; i++) {
for (let i = 0; i < actionArray.length; i++) {
if (actionArray[i].id == actionId) {
actionArray[i].execute();

Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/adaptivecards/src/controls/popup-menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class PopupMenu extends PopupControl {
element.className = this.hostConfig.makeCssClassName("ac-ctrl ac-popup");
element.setAttribute("role", "listbox");

for (var i = 0; i < this._items.length; i++) {
for (let i = 0; i < this._items.length; i++) {
var renderedItem = this._items.get(i).render(this.hostConfig);
renderedItem.tabIndex = 0;

Expand Down