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.

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

Upgrade to ember 1.13.7 #146

Merged
merged 2 commits into from
Aug 11, 2015
Merged

Upgrade to ember 1.13.7 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56302bb
Upgrade to ember 1.13.7 including cli and nessecary classNames => cla…
peec Aug 10, 2015
3adf117
Add changelog
peec Aug 10, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### 0.2.7 (Aug 04, 2015)
- [#132](https://github.com/miguelcobain/ember-paper/pull/132) Added autocomplete component.
- [#144](https://github.com/miguelcobain/ember-paper/pull/144) Fixed paper-icon sizes and added new size md-sm (size="sm").
- [#146](https://github.com/miguelcobain/ember-paper/pull/146) Upgrade to ember 1.13.7 and ember-cli 1.13.7.

### 0.2.6 (Jul 20, 2015)

Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-autocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export default Ember.Component.extend(HasBlockMixin, {
}
}).readOnly(),

suggestions: Ember.computed('debouncedSearchText', 'sourcePromiseArray.@each', function() {
suggestions: Ember.computed('debouncedSearchText', 'sourcePromiseArray.[]', function() {
var source = this.get('sourcePromiseArray');
var lookupKey = this.get('lookupKey');
var searchText = (this.get('debouncedSearchText') || '').toLowerCase();
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default Ember.Component.extend(RippleMixin, ProxyMixin, {
return secondaryItem && (secondaryItem.action || (this.get('action') && this.isProxiedComponent(secondaryItem)));
}),

secondaryItem: Ember.computed('proxiedComponents.@each', function() {
secondaryItem: Ember.computed('proxiedComponents.[]', function() {
var proxiedComponents = this.get('proxiedComponents');
return proxiedComponents.find(function(component) {
return component.classNames.indexOf('md-secondary') !== -1;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/paper-item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#if action}}
{{#paper-button classNames="md-no-style" noink=true action="buttonAction" skipProxy=true}}
{{#paper-button class="md-no-style" noink=true action="buttonAction" skipProxy=true}}
<div class="md-list-item-inner">
{{yield}}
</div>
Expand Down
9 changes: 3 additions & 6 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
{
"name": "ember-paper",
"dependencies": {
"ember": "release",
"ember": "1.13.7",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-qunit": "0.4.2",
"ember-qunit": "0.4.9",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.18",
"hammerjs": "~2.0.4",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1",
"qunit": "~1.18.0",
"prism": "*"
},
"resolutions": {
"ember": "release"
}
}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"broccoli-asset-rev": "^2.0.2",
"broccoli-merge-trees": "~0.2.1",
"broccoli-static-compiler": "~0.2.1",
"ember-cli": "1.13.1",
"ember-cli": "1.13.7",
"ember-cli-app-version": "0.4.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.0.0",
Expand All @@ -33,7 +33,7 @@
"ember-cli-htmlbars-inline-precompile": "^0.1.1",
"ember-cli-ic-ajax": "0.2.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.15",
"ember-cli-qunit": "0.3.20",
"ember-cli-release": "0.2.3",
"ember-cli-sass": "4.0.0-beta.5",
"ember-cli-uglify": "^1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions tests/dummy/app/templates/application.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#paper-nav-container open=drawerOpen classNames="ember-app"}}
{{#paper-nav-container open=drawerOpen class="ember-app"}}

{{#paper-sidenav classNames="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}
{{#paper-sidenav class="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}

{{#paper-toolbar}}
<div class="md-toolbar-tools">
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/autocomplete.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">

{{#paper-card}}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/button.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span>Buttons</span>
</h2>
{{/paper-toolbar}}
{{#paper-content classNames="md-padding demo-buttons"}}
{{#paper-content class="md-padding demo-buttons"}}
<div class="doc-content">
<p>
{{#paper-button action="flatButton"}}Button with action{{/paper-button}}
Expand Down
4 changes: 2 additions & 2 deletions tests/dummy/app/templates/card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
{{#paper-content class="md-whiteframe-z1 list-demo"}}
{{#paper-card}}
<img src="washedout.png" alt="Washed Out">
{{#paper-card-content}}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/checkbox.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span>Checkboxes</span>
</h2>
{{/paper-toolbar}}
{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
{{#paper-checkbox checked=value1}}A checkbox: {{value1}}{{/paper-checkbox}}
{{#paper-checkbox checked=value2}}A checkbox: {{#if value2}}yep{{else}}nope{{/if}}{{/paper-checkbox}}
Expand Down
8 changes: 4 additions & 4 deletions tests/dummy/app/templates/divider.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<h4>Full width dividers</h4>
{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
{{#paper-content class="md-whiteframe-z1 list-demo"}}
{{#paper-list}}
{{#each listData as |item|}}
{{#paper-item class="md-3-line"}}
Expand All @@ -29,7 +29,7 @@
{{/paper-content}}

<h4>Inset dividers</h4>
{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
{{#paper-content class="md-whiteframe-z1 list-demo"}}
{{#paper-list}}
{{#each listData as |item|}}
{{#paper-item class="md-3-line"}}
Expand All @@ -49,7 +49,7 @@

<h3>Template</h3>
{{#code-block language='handlebars'}}
\{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
\{{#paper-content class="md-whiteframe-z1 list-demo"}}
\{{#paper-list}}
\{{#each listData as |item|}}
\{{#paper-item}}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/icons.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding icon-demo"}}
{{#paper-content class="md-padding icon-demo"}}

<h3>Template</h3>
<h4>Basic Icons</h4>
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<h2 class="md-headline" style="margin-top: 0;">Welcome to Ember Paper.</h2>
<p>This project aims to bring Google's new <a href="https://www.google.com/design/spec/material-design/introduction.html">Material Design</a> to Ember. The goal is to encapsulate everything possible in Ember components. This project is packaged as an <a href="http://www.ember-cli.com/">Ember-cli</a> addon.</p>
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/input.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<ul class="paper-list-inline">
<li>{{paper-input label="Name" value=name}}</li>
Expand Down
40 changes: 20 additions & 20 deletions tests/dummy/app/templates/list-controls.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,37 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<h3>Basic Usage</h3>
{{#paper-content classNames="md-whiteframe-z1 list-demo list-controls-demo"}}
{{#paper-content class="md-whiteframe-z1 list-demo list-controls-demo"}}
{{#paper-list}}
{{#paper-subheader classNames="md-no-sticky"}}Single Action Checkboxes{{/paper-subheader}}
{{#paper-subheader class="md-no-sticky"}}Single Action Checkboxes{{/paper-subheader}}

{{#paper-item}}
<p>Checkbox 1</p>
{{paper-checkbox classNames="md-secondary" checked=checkboxEnabled1}}
{{paper-checkbox class="md-secondary" checked=checkboxEnabled1}}
{{/paper-item}}

{{#paper-item}}
<p>Checkbox 2</p>
{{paper-checkbox classNames="md-secondary" checked=checkboxEnabled2}}
{{paper-checkbox class="md-secondary" checked=checkboxEnabled2}}
{{/paper-item}}

{{paper-divider}}

{{#paper-subheader classNames="md-no-sticky"}}Clickable Items with Secondary Controls{{/paper-subheader}}
{{#paper-subheader class="md-no-sticky"}}Clickable Items with Secondary Controls{{/paper-subheader}}

{{#paper-item action="transitionToWifiMenu"}}
{{paper-icon icon="network-wifi"}}
<p>Wi-Fi</p>
{{paper-switch classNames="md-secondary" checked=wifiEnabled}}
{{paper-switch class="md-secondary" checked=wifiEnabled}}
{{/paper-item}}

{{#paper-item action="transitionToBluetoothMenu"}}
{{paper-icon icon="bluetooth"}}
<p>Bluetooth</p>
{{paper-switch classNames="md-secondary" checked=bluetoothEnabled}}
{{paper-switch class="md-secondary" checked=bluetoothEnabled}}
{{/paper-item}}

{{#paper-item action="transitionToDataUsage"}}
Expand All @@ -47,7 +47,7 @@

{{paper-divider}}

{{#paper-subheader classNames="md-no-sticky"}}Checkbox with Secondary Action{{/paper-subheader}}
{{#paper-subheader class="md-no-sticky"}}Checkbox with Secondary Action{{/paper-subheader}}

{{#each messageData as |item|}}
{{#paper-item}}
Expand All @@ -61,7 +61,7 @@

{{#paper-divider}}{{/paper-divider}}

{{#paper-subheader classNames="md-no-sticky"}}Clickable Avatars{{/paper-subheader}}
{{#paper-subheader class="md-no-sticky"}}Clickable Avatars{{/paper-subheader}}

{{#each listData as |item|}}
{{#paper-item class="md-3-line" param=item action="goToPerson"}}
Expand All @@ -76,7 +76,7 @@

{{paper-divider}}

{{#paper-subheader classNames="md-no-sticky"}}Avatar with Secondary Action Icon{{/paper-subheader}}
{{#paper-subheader class="md-no-sticky"}}Avatar with Secondary Action Icon{{/paper-subheader}}

{{#each listData as |item|}}
{{#paper-item class="md-3-line" param=item action="goToPerson"}}
Expand All @@ -100,32 +100,32 @@
{{#code-block language='handlebars'}}

\{{#paper-list}}
\{{#paper-subheader classNames="md-no-sticky"}}Single Action Checkboxes\{{/paper-subheader}}
\{{#paper-subheader class="md-no-sticky"}}Single Action Checkboxes\{{/paper-subheader}}

\{{#paper-item}}
&lt;p&gt;Checkbox 1&lt;/p&gt;
\{{paper-checkbox classNames="md-secondary" checked=checkboxEnabled1}}
\{{paper-checkbox class="md-secondary" checked=checkboxEnabled1}}
\{{/paper-item}}

\{{#paper-item}}
&lt;p&gt;Checkbox 2&lt;/p&gt;
\{{paper-checkbox classNames="md-secondary" checked=checkboxEnabled2}}
\{{paper-checkbox class="md-secondary" checked=checkboxEnabled2}}
\{{/paper-item}}

\{{paper-divider}}

\{{#paper-subheader classNames="md-no-sticky"}}Clickable Items with Secondary Controls\{{/paper-subheader}}
\{{#paper-subheader class="md-no-sticky"}}Clickable Items with Secondary Controls\{{/paper-subheader}}

\{{#paper-item action="transitionToWifiMenu"}}
\{{paper-icon icon="network-wifi"}}
&lt;p&gt;Wi-Fi&lt;/p&gt;
\{{paper-switch classNames="md-secondary" checked=wifiEnabled}}
\{{paper-switch class="md-secondary" checked=wifiEnabled}}
\{{/paper-item}}

\{{#paper-item action="transitionToBluetoothMenu"}}
\{{paper-icon icon="bluetooth"}}
&lt;p&gt;Bluetooth&lt;/p&gt;
\{{paper-switch classNames="md-secondary" checked=bluetoothEnabled}}
\{{paper-switch class="md-secondary" checked=bluetoothEnabled}}
\{{/paper-item}}

\{{#paper-item action="transitionToDataUsage"}}
Expand All @@ -135,7 +135,7 @@

\{{paper-divider}}

\{{#paper-subheader classNames="md-no-sticky"}}Checkbox with Secondary Action\{{/paper-subheader}}
\{{#paper-subheader class="md-no-sticky"}}Checkbox with Secondary Action\{{/paper-subheader}}

\{{#each messageData as |item|}}
\{{#paper-item}}
Expand All @@ -149,7 +149,7 @@

\{{#paper-divider}}\{{/paper-divider}}

\{{#paper-subheader classNames="md-no-sticky"}}Clickable Avatars\{{/paper-subheader}}
\{{#paper-subheader class="md-no-sticky"}}Clickable Avatars\{{/paper-subheader}}

\{{#each listData as |item|}}
\{{#paper-item class="md-3-line" param=item action="goToPerson"}}
Expand All @@ -164,7 +164,7 @@

\{{paper-divider}}

\{{#paper-subheader classNames="md-no-sticky"}}Avatar with Secondary Action Icon\{{/paper-subheader}}
\{{#paper-subheader class="md-no-sticky"}}Avatar with Secondary Action Icon\{{/paper-subheader}}

\{{#each listData as |item|}}
\{{#paper-item class="md-3-line" param=item action="goToPerson"}}
Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/templates/list.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<h3>Basic Usage</h3>
{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
{{#paper-content class="md-whiteframe-z1 list-demo"}}
{{#paper-list}}
{{#each listData as |item|}}
{{#paper-item class="md-3-line"}}
Expand All @@ -30,7 +30,7 @@

<h4>Template</h4>
{{#code-block language='handlebars'}}
\{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
\{{#paper-content class="md-whiteframe-z1 list-demo"}}
\{{#paper-list}}
\{{#each listData as |item|}}
\{{#paper-item class="md-3-line"}}
Expand Down
8 changes: 4 additions & 4 deletions tests/dummy/app/templates/progress-circular.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<h3>Basic Usage</h3>
<h4>Determinate</h4>
Expand All @@ -25,10 +25,10 @@
<h4>Theming</h4>

<div layout="row" layout-sm="column" layout-align="space-around">
{{paper-progress-circular classNames="md-hue-2"}}
{{paper-progress-circular class="md-hue-2"}}
{{paper-progress-circular accent=true}}
{{paper-progress-circular accent=true classNames="md-hue-1"}}
{{paper-progress-circular warn=true classNames="md-hue-3"}}
{{paper-progress-circular accent=true class="md-hue-1"}}
{{paper-progress-circular warn=true class="md-hue-3"}}
{{paper-progress-circular warn=true}}
</div>

Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/progress-linear.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<h3>Basic Usage</h3>

Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/radio.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<ul class="paper-list-inline">
<li>{{#paper-radio}}A radio button{{/paper-radio}}</li>
Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/templates/sidenav.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</h2>
{{/paper-toolbar}}

{{#paper-content classNames="md-padding"}}
{{#paper-content class="md-padding"}}
<div class="doc-content">
<p>Try to resize this webpage.</p>
<h3>Template</h3>
{{#code-block language='handlebars'}}\{{#paper-nav-container open=drawerOpen classNames="ember-app"}}
{{#code-block language='handlebars'}}\{{#paper-nav-container open=drawerOpen class="ember-app"}}

\{{#paper-sidenav classNames="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}
\{{#paper-sidenav class="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}

\{{#paper-toolbar}}
&lt;div class="md-toolbar-tools"&gt;
Expand Down
Loading