Skip to content

Feature/consistent code style#1695

Merged
marla-singer merged 24 commits intodevelopfrom
feature/consistent-code-style
Oct 5, 2016
Merged

Feature/consistent code style#1695
marla-singer merged 24 commits intodevelopfrom
feature/consistent-code-style

Conversation

@brylie
Copy link
Copy Markdown
Contributor

@brylie brylie commented Oct 5, 2016

Closes #1690
Closes #1643

Working through our codebase to improve the consistency of:

  • handlebars helpers
  • template nesting
  • adding internationalization strings where missing

@brylie brylie added this to the Sprint 32 milestone Oct 5, 2016
@brylie
Copy link
Copy Markdown
Contributor Author

brylie commented Oct 5, 2016

@marla-singer please review.

@marla-singer marla-singer self-assigned this Oct 5, 2016
Copy link
Copy Markdown
Contributor

@marla-singer marla-singer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finished review. Tried to catch all places that need in refactoring too.

name="apiDocumentationFile"
class="input-file"
type="file"
>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the indentation on this fragment. It may be sufficient to use two spaces for attribute enumeration

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fixed in a later commit. Please pull recent changes.

{{#if api.currentUserCanEdit }}
{{> visibilityToggle api=api }}
{{/if }}
{{> visibilityToggle api=api }}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove condition? It was added to don't show toggle to anonymous and non-owner

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since it in settings view now, we don't need this check anymore.

<i>{{_ "apiBacklogList_noApiBacklogItemsFound"}}</i>
{{/if}}
{{> autoformModals }}
{{# if backlogItems}}
Copy link
Copy Markdown
Contributor

@marla-singer marla-singer Oct 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgot a space after helper name

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

{{#each api in apis }}
{{#if api.currentUserCanView }}
{{# each api in apis }}
{{# if api.currentUserCanView }}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the indentation on this file. Condition is nested

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

{{#autoForm collection=apisCollection doc=api id="apiDocumentationForm" type="update" }}
{{# autoForm
collection=apisCollection
doc=api id="apiDocumentationForm"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate this line to two lines too

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

{{_ "feedback_feedbackForm_description" }}
</p>
{{> afQuickField name='topic' }}
{{> afQuickField name='message' rows=4}}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a space after number '4'

type="button"
class="btn btn-info btn-xs pull-right feedback-form-button"
id="add-feedback"
>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Return the sign ">" on the previous line

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

{{# autoForm
collection=proxiesCollection
id="proxyForm"
type=formType doc=proxy}}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate this line to two lines too

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already done.

@marla-singer marla-singer merged commit 649bfc3 into develop Oct 5, 2016
@marla-singer marla-singer deleted the feature/consistent-code-style branch October 5, 2016 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants