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

Jump to bottom

Fix ability to click in canary and refactor #423

Merged
merged 1 commit into from
May 2, 2016
Merged

Fix ability to click in canary and refactor #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions app/components/dummy-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import ResizeMixin from 'ember-twiddle/lib/resize-mixin';
import ResizeMixin from 'ember-twiddle/mixins/resize';

const { $, on, inject } = Ember;

Expand Down Expand Up @@ -52,9 +52,9 @@ export default Ember.Component.extend(ResizeMixin, {

didResize: on('didInsertElement', function () {
let offset = this.$().offset(), width = this.$().width(),
height = this.$().height();
height = this.$().height();

$('#app').css({
$('#root').css({
top: offset.top,
left: offset.left,
width: width,
Expand Down
3 changes: 0 additions & 3 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
<div id="main-app">
</div>

<div id="app">
</div>

<script src="assets/vendor.js"></script>
<script src="assets/ember-twiddle.js"></script>

Expand Down
0 app/lib/resize-mixin.js → app/mixins/resize.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/styles/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body {
width: 100%;
}

#app {
#root {
position: absolute;
}

Expand Down
3 changes: 0 additions & 3 deletions tests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<div id="main-app">
</div>

<div id="app">
</div>

{{content-for "body"}}
{{content-for "test-body"}}

Expand Down