Skip to content
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.

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

Feature/2.1 upgrade #143

Merged
merged 8 commits into from Nov 18, 2016
Merged

Feature/2.1 upgrade #143

merged 8 commits into from Nov 18, 2016

Conversation

emoralesb05
Copy link
Contributor

@emoralesb05 emoralesb05 commented Nov 10, 2016

Description

Upgrade @angular dependencies
Fixes #141

What's included?

Test Steps

  • npm uninstall -g angular-cli
  • npm cache clean
  • npm install -g angular-cli@latest
  • rm -rf node_modules dist tmp
  • npm i
  • ng serve
  • See docs still working

This was referenced Nov 10, 2016
@@ -19,84 +44,55 @@ <h4 class="md-subhead">with custom headings, columns, and inline editing</h4>
<th td-data-table-column
*ngFor="let column of columns"
[numeric]="column.numeric">
{{column.label}}
{ {column.label}}
Copy link
Contributor

Choose a reason for hiding this comment

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

formatting?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Its an angular2 issue where if it finds {{ anywhere in an html file, it passes it to its compiler.

So we need to add a space between them to be able to render it in the highlight component.

</th>
<tr td-data-table-row *ngFor="let row of basicData">
<td td-data-table-cell (click)="openPrompt(row, 'comments')">
<button md-button [class.md-accent]="!row['comments']">{{row['comments'] || 'Add Comment'}}</button>
<button md-button [class.md-accent]="!row['comments']">{ {row['comments'] || 'Add Comment'}}</button>
Copy link
Contributor

Choose a reason for hiding this comment

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

here also

Copy link
Contributor

Choose a reason for hiding this comment

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

yup good catch but like Ed said we have to do this to render code snippets in highlight.js for docs

</td>
<td td-data-table-cell *ngFor="let column of columns" [numeric]="column.numeric">
{{row[column.name]}}
{ {row[column.name]}}
Copy link
Contributor

Choose a reason for hiding this comment

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

and here

@kyleledbetter kyleledbetter merged commit b806afa into develop Nov 18, 2016
@emoralesb05 emoralesb05 deleted the feature/2.1-upgrade branch November 18, 2016 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error: "Promise rejection: Cannot read property 'currValExpr' of null"
3 participants