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

Upgrade/emberjs 1.13.2 #113

Merged
merged 12 commits into from
Jul 10, 2015
3 changes: 2 additions & 1 deletion addon/components/base-focusable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Ember from 'ember';
import EventsMixin from '../mixins/events-mixin';
import HasBlockMixin from '../mixins/hasblock-mixin';

export default Ember.Component.extend(EventsMixin, {
export default Ember.Component.extend(EventsMixin, HasBlockMixin, {
disabled: false,
pressed: false,
active: false,
Expand Down
1 change: 1 addition & 0 deletions addon/components/paper-nav-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Ember from 'ember';
import FlexMixin from '../mixins/flex-mixin';

export default Ember.Component.extend(FlexMixin, {

tagName: 'md-nav-container',
classNames: ['paper-nav-container'],
classNameBindings: ['open:sidenav-expanded'],
Expand Down
7 changes: 4 additions & 3 deletions addon/components/paper-sidenav-toggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ export default Ember.Component.extend({
classNames: ['paper-sidenav-toggle'],
toggle: true,

navContainer: Ember.computed(function() {
navContainer: Ember.computed(function () {
return this.nearestOfType(PaperNavContainer);
}),

click() {
var navContainer = this.get("navContainer");
if (this.get('toggle')) {
this.get('navContainer').toggleSidenav();
navContainer.toggleSidenav();
} else {
this.get('navContainer').expandSidenav();
navContainer.expandSidenav();
}
return false;
}
Expand Down
16 changes: 16 additions & 0 deletions addon/mixins/hasblock-mixin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import Ember from 'ember';

/**
* This mixin add support for hasBlock for Ember < 1.13.0
*
* @todo Remove in Ember 2.0
* See also https://github.com/emberjs/ember.js/pull/11313
*/
export default Ember.Mixin.create({
hasBlock: Ember.computed(function () {
if (typeof this._super.hasBlock === 'undefined') {
return !!this.get("template");
}
return this.hasBlock;
})
});
2 changes: 1 addition & 1 deletion app/templates/components/paper-button.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<span type={{type}} disabled={{disabled}}>
{{#if template}}
{{#if hasBlock}}
{{yield}}
{{else}}
{{label}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/paper-checkbox.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="md-container">
<div class="md-icon"></div>
</div>
{{#if template}}
{{#if hasBlock}}
<div class="md-label">
<span>
{{yield}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/paper-radio.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="md-off"></div>
<div class="md-on"></div>
</div>
{{#if template}}
{{#if hasBlock}}
<div class="md-label">
{{yield}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/paper-switch.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>
</div>
</div>
{{#if template}}
{{#if hasBlock}}
<div class="md-label">
{{yield}}
</div>
Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "ember-paper",
"dependencies": {
"ember": "1.12.0",
"ember": "1.13.3",
"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.4",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-qunit": "0.4.0",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.15",
"ember-resolver": "~0.1.18",
"hammerjs": "~2.0.4",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
Expand Down
15 changes: 15 additions & 0 deletions tests/dummy/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,15 @@ ul li {
ul li:first-child {
margin-top: 0;
}

body {

&> .ember-view {
width: 100%;
height: 100%;
}

}
/*
*, *:before, *:after {
box-sizing: border-box;
Expand All @@ -133,6 +142,12 @@ body {
margin: 0;
padding: 0;
outline: none;

&> .ember-view {
width: 100%;
height: 100%;
}

}

p {
Expand Down
5 changes: 0 additions & 5 deletions tests/dummy/app/views/application.js

This file was deleted.