Skip to content

Upgrade to Ember to 1.11.0(-beta.5) #12

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade to Ember to 1.11.0(-beta.5) #12

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
3a04cfa
Bumped Ember to 1.11.0-beta.5.
atsjj Mar 12, 2015
f1ee0ed
Converted all bind-attr to ember-htmlbars-attribute-syntax.
atsjj Mar 12, 2015
6d75cdd
Added back dep, lost in upgrade to Ember CLI latest.
atsjj Mar 12, 2015
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
4 changes: 2 additions & 2 deletions app/templates/application.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="app-bar">
<div class="gutter" {{action "toggleNavBar"}}>
<i {{bind-attr class=":icon-menu showingNavBar:rotate-cw"}}></i>
<i class="icon-menu {{if showingNavBar "rotate-cw"}}"></i>
</div>
<h1>Hacker News</h1>
</div>
Expand Down Expand Up @@ -39,7 +39,7 @@
{{/link-to}}
</nav>

<div {{bind-attr class=":app-main showingNavBar:slide-out"}}>
<div class="app-main {{if showingNavBar "slide-out"}}">
{{outlet}}
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/comment-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<span class="submitted">{{link-to comment.submitted (query-params highlight=comment.id)}}</span>
</div>

<div class="body" {{bind-attr style=bodyStyle}}>{{comment.body}}</div>
<div class="body" style="{{bodyStyle}}">{{comment.body}}</div>

{{#if comment.comments}}

Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/story-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{#if story.source}}
<div class="source">
<a {{bind-attr href=story.url}} target="_blank" class="source-link">{{story.source}}</a>
<a href="{{story.url}}" target="_blank" class="source-link">{{story.source}}</a>
</div>
{{/if}}

Expand Down
2 changes: 1 addition & 1 deletion app/templates/preferences.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</label>
</div>

<div {{bind-attr class=":row preferences.autoFold::hidden"}}>
<div class="row {{unless preferences.autoFold "hidden"}}">
<h5>Folding Threshold</h5>

{{#if topLevelOnly}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/stories.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</ol>
</div>

<div {{bind-attr class=":app-content hasContent:active"}}>
<div class="app-content {{if hasContent "active"}}">
{{outlet}}
</div>
2 changes: 1 addition & 1 deletion app/templates/stories/show.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{{/unless}}
</div>

<div {{bind-attr class=":story-reader-content isInternal:internal"}}>
<div class="story-reader-content {{if isInternal "internal"}}">
{{outlet}}
</div>
</div>
2 changes: 1 addition & 1 deletion app/templates/stories/show/article.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</p>
{{/if}}

<p><a {{bind-attr href=url}} target="_blank">View original</a></p>
<p><a href="{{url}}" target="_blank">View original</a></p>
</div>
{{else}}
<article>
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hn-reader",
"dependencies": {
"jquery": "^1.11.1",
"ember": "1.10.0",
"ember": "1.11.0-beta.5",
"ember-data": "1.0.0-beta.15",
"ember-resolver": "~0.1.12",
"entypo-plus": "chancancode/entypo-plus",
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.15",
"ember-export-application-global": "^1.0.2",
"ember-inflector": "1.3.1"
"ember-inflector": "1.3.1",
"glob": "4.0.5"
},
"ember-addon": {
"paths": [
Expand Down