From cf3ff1039aee5009d97e0385abe9acc8db80c2f9 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Thu, 25 Jun 2015 03:59:17 +0200 Subject: [PATCH 01/11] Successfully upgrade to emberjs 1.13.2. --- app/templates/components/paper-button.hbs | 2 +- app/templates/components/paper-checkbox.hbs | 2 +- app/templates/components/paper-radio.hbs | 2 +- app/templates/components/paper-switch.hbs | 2 +- bower.json | 2 +- package.json | 2 +- tests/dummy/app/styles/app.scss | 6 ++++++ tests/dummy/app/views/application.js | 5 ----- 8 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 tests/dummy/app/views/application.js diff --git a/app/templates/components/paper-button.hbs b/app/templates/components/paper-button.hbs index 8d7925d74..06ff6d1ce 100644 --- a/app/templates/components/paper-button.hbs +++ b/app/templates/components/paper-button.hbs @@ -1,5 +1,5 @@ - {{#if template}} + {{#if hasBlock}} {{yield}} {{else}} {{label}} diff --git a/app/templates/components/paper-checkbox.hbs b/app/templates/components/paper-checkbox.hbs index f37bca833..c960512f0 100644 --- a/app/templates/components/paper-checkbox.hbs +++ b/app/templates/components/paper-checkbox.hbs @@ -1,7 +1,7 @@
-{{#if template}} +{{#if hasBlock}}
{{yield}}
diff --git a/app/templates/components/paper-radio.hbs b/app/templates/components/paper-radio.hbs index 674c8d342..3cf3ffe2c 100644 --- a/app/templates/components/paper-radio.hbs +++ b/app/templates/components/paper-radio.hbs @@ -2,7 +2,7 @@
-{{#if template}} +{{#if hasBlock}}
{{yield}}
diff --git a/app/templates/components/paper-switch.hbs b/app/templates/components/paper-switch.hbs index fe0a62a8d..036601071 100644 --- a/app/templates/components/paper-switch.hbs +++ b/app/templates/components/paper-switch.hbs @@ -6,7 +6,7 @@ -{{#if template}} +{{#if hasBlock}}
{{yield}}
diff --git a/bower.json b/bower.json index c653e0f59..99104edfb 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-paper", "dependencies": { - "ember": "1.12.0", + "ember": "1.13.2", "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", diff --git a/package.json b/package.json index de21e4fbf..3c2cc0406 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "ember-disable-prototype-extensions": "^1.0.0", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", - "ember-prism": "0.0.4", + "ember-prism": "0.0.5", "ember-try": "0.0.6" }, "dependencies": { diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index d30bac145..90d83333a 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -14,6 +14,12 @@ body { margin: 0; padding: 0; outline: none; + + &> .ember-view { + width: 100%; + height: 100%; + } + } .ember-app { diff --git a/tests/dummy/app/views/application.js b/tests/dummy/app/views/application.js deleted file mode 100644 index 241bafb97..000000000 --- a/tests/dummy/app/views/application.js +++ /dev/null @@ -1,5 +0,0 @@ -import Ember from 'ember'; - -export default Ember.View.extend({ - classNames: ['ember-app'] -}); From 3fa9b1f11a1f6257d1240226db8619d63e956c11 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Thu, 25 Jun 2015 05:20:23 +0200 Subject: [PATCH 02/11] nearestOfType does not work well with 1.13.2. Rewrite the requirement for nearestOfType. Use global event bus principles for toggle menu operation. The eventbus fits quite nice for such operation. Rewrite test for navmenu to conform to the new way of handling toggle of menu. The event bus can also be triggered from anywhere by using the new events: paper:toggle-sidenav and paper:expand-sidenav. This is the final commit as of 1.13.2 migration it seems. After testing everything seems to be fine. --- addon/components/paper-nav-container.js | 14 ++++++++++++++ addon/components/paper-sidenav-toggle.js | 9 +++------ addon/initializers/ember-paper.js | 14 ++++++++++++++ addon/services/paper-eventbus.js | 13 +++++++++++++ app/initializers/ember-paper.js | 2 ++ app/services/paper-eventbus.js | 1 + .../components/paper-nav-container-test.js | 2 +- .../components/paper-sidenav-toggle-test.js | 19 ++++++++----------- 8 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 addon/initializers/ember-paper.js create mode 100644 addon/services/paper-eventbus.js create mode 100644 app/initializers/ember-paper.js create mode 100644 app/services/paper-eventbus.js diff --git a/addon/components/paper-nav-container.js b/addon/components/paper-nav-container.js index 3f225468f..215c5b79e 100644 --- a/addon/components/paper-nav-container.js +++ b/addon/components/paper-nav-container.js @@ -2,12 +2,26 @@ import Ember from 'ember'; import FlexMixin from '../mixins/flex-mixin'; export default Ember.Component.extend(FlexMixin, { + + paperEventBus: Ember.inject.service('paper-eventbus'), + tagName: 'md-nav-container', classNames: ['paper-nav-container'], classNameBindings: ['open:sidenav-expanded'], open: false, + _initialize: Ember.on('init', function(){ + var eventBus = this.get("paperEventBus"); + eventBus.subscribe('paper:toggle-sidenav', this, 'toggleSidenav'); + eventBus.subscribe('paper:expand-sidenav', this, 'expandSidenav'); + }), + _tearDown: Ember.on('willDestroyElement', function(){ + var eventBus = this.get("paperEventBus"); + eventBus.unsubscribe('toggleSidenav'); + eventBus.unsubscribe('expandSidenav'); + }), + // Custom events toggleSidenav() { this.toggleProperty('open'); diff --git a/addon/components/paper-sidenav-toggle.js b/addon/components/paper-sidenav-toggle.js index f8474ef49..1124dc3d9 100644 --- a/addon/components/paper-sidenav-toggle.js +++ b/addon/components/paper-sidenav-toggle.js @@ -1,20 +1,17 @@ import Ember from 'ember'; -import PaperNavContainer from './paper-nav-container'; export default Ember.Component.extend({ tagName: 'md-sidenav-toggle', classNames: ['paper-sidenav-toggle'], toggle: true, - navContainer: Ember.computed(function() { - return this.nearestOfType(PaperNavContainer); - }), + paperEventBus: Ember.inject.service('paper-eventbus'), click() { if (this.get('toggle')) { - this.get('navContainer').toggleSidenav(); + this.get("paperEventBus").publish('paper:toggle-sidenav'); } else { - this.get('navContainer').expandSidenav(); + this.get("paperEventBus").publish('paper:expand-sidenav'); } return false; } diff --git a/addon/initializers/ember-paper.js b/addon/initializers/ember-paper.js new file mode 100644 index 000000000..79b8409a2 --- /dev/null +++ b/addon/initializers/ember-paper.js @@ -0,0 +1,14 @@ +import EventBus from '../services/paper-eventbus'; + +export function initialize(container, application) { + var eventBus = EventBus.create(); + application.register('paper-event-bus:current', eventBus, { + instantiate: false + }); + + application.inject('component', 'paper-eventbus', 'paper-event-bus:current'); +} +export default { + name: 'ember-paper', + initialize: initialize +}; diff --git a/addon/services/paper-eventbus.js b/addon/services/paper-eventbus.js new file mode 100644 index 000000000..3698be52f --- /dev/null +++ b/addon/services/paper-eventbus.js @@ -0,0 +1,13 @@ +import Ember from 'ember'; + +export default Ember.Service.extend(Ember.Evented, { + publish: function () { + return this.trigger.apply(this, arguments); + }, + subscribe: function () { + return this.on.apply(this, arguments); + }, + unsubscribe: function () { + return this.off.apply(this, arguments); + } +}); diff --git a/app/initializers/ember-paper.js b/app/initializers/ember-paper.js new file mode 100644 index 000000000..e6ec9edee --- /dev/null +++ b/app/initializers/ember-paper.js @@ -0,0 +1,2 @@ +import PaperInitializer from 'ember-paper/initializers/ember-paper'; +export default PaperInitializer; diff --git a/app/services/paper-eventbus.js b/app/services/paper-eventbus.js new file mode 100644 index 000000000..286ad0dc6 --- /dev/null +++ b/app/services/paper-eventbus.js @@ -0,0 +1 @@ +export { default } from 'ember-paper/services/paper-eventbus'; \ No newline at end of file diff --git a/tests/unit/components/paper-nav-container-test.js b/tests/unit/components/paper-nav-container-test.js index db16d0d21..d3d26a808 100644 --- a/tests/unit/components/paper-nav-container-test.js +++ b/tests/unit/components/paper-nav-container-test.js @@ -6,7 +6,7 @@ import { moduleForComponent('paper-nav-container', 'PaperNavContainerComponent', { // specify the other units that are required for this test - needs: ['component:paper-backdrop'] + needs: ['component:paper-backdrop', 'service:paper-eventbus'] }); test('it renders', function(assert) { diff --git a/tests/unit/components/paper-sidenav-toggle-test.js b/tests/unit/components/paper-sidenav-toggle-test.js index 115b0a362..3e1eb2d51 100644 --- a/tests/unit/components/paper-sidenav-toggle-test.js +++ b/tests/unit/components/paper-sidenav-toggle-test.js @@ -6,7 +6,7 @@ import { moduleForComponent('paper-sidenav-toggle', 'PaperSidenavToggleComponent', { // specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] + needs: ['service:paper-eventbus'] }); test('it renders', function(assert) { @@ -27,11 +27,9 @@ test('when clicked triggers `toggleSidenav` on navContainer', function(assert) { var component = this.subject(); var didFire = false; - component.set('navContainer', Ember.Object.create({ - toggleSidenav: function() { - didFire = true; - } - })); + component.get('paperEventBus').subscribe('paper:toggle-sidenav', function () { + didFire = true; + }); var $component = this.$(); Ember.run(function() { @@ -45,11 +43,10 @@ test('when clicked triggers `expandSidenav` if toggle is false on navContainer', assert.expect(1); var component = this.subject({toggle: false}); var didFire = false; - component.set('navContainer', Ember.Object.create({ - expandSidenav: function() { - didFire = true; - } - })); + + component.get('paperEventBus').subscribe('paper:expand-sidenav', function () { + didFire = true; + }); var $component = this.$(); Ember.run(function() { From 167c0f682933c3a020c0a614911e85aedb029ca8 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 13:14:23 +0200 Subject: [PATCH 03/11] Update to ember 1.13.3 --- bower.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 99104edfb..bd0e8f4b2 100644 --- a/bower.json +++ b/bower.json @@ -1,13 +1,13 @@ { "name": "ember-paper", "dependencies": { - "ember": "1.13.2", + "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", From 218c0815ab5b01b8181a52ba09cfad3136a474af Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 13:47:21 +0200 Subject: [PATCH 04/11] Support hasBlock for Ember version < 1.13 --- addon/components/base-focusable.js | 4 +++- addon/mixins/hasblock-mixin.js | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 addon/mixins/hasblock-mixin.js diff --git a/addon/components/base-focusable.js b/addon/components/base-focusable.js index 92e187f70..f64ff5bfe 100644 --- a/addon/components/base-focusable.js +++ b/addon/components/base-focusable.js @@ -1,7 +1,9 @@ import Ember from 'ember'; import EventsMixin from '../mixins/events-mixin'; +import ProxiableMixin from 'ember-paper/mixins/proxiable-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, diff --git a/addon/mixins/hasblock-mixin.js b/addon/mixins/hasblock-mixin.js new file mode 100644 index 000000000..48490f492 --- /dev/null +++ b/addon/mixins/hasblock-mixin.js @@ -0,0 +1,13 @@ +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 () { + return !!this.get("template"); + }) +}); From e04fa0277df34d60945e87d68e778ec8ba72a7f8 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 13:49:16 +0200 Subject: [PATCH 05/11] Remove unused mixin import --- addon/components/base-focusable.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addon/components/base-focusable.js b/addon/components/base-focusable.js index f64ff5bfe..b4199adbf 100644 --- a/addon/components/base-focusable.js +++ b/addon/components/base-focusable.js @@ -1,6 +1,5 @@ import Ember from 'ember'; import EventsMixin from '../mixins/events-mixin'; -import ProxiableMixin from 'ember-paper/mixins/proxiable-mixin'; import HasBlockMixin from '../mixins/hasblock-mixin'; export default Ember.Component.extend(EventsMixin, HasBlockMixin, { From d27cc3500b5a8f7ae5a72e769d8b972e0b8b2ed7 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 13:58:52 +0200 Subject: [PATCH 06/11] Add style again to avoid needing the views (deprecated.). --- tests/dummy/app/styles/app.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index 507e8b61b..c83427123 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -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; From 119341890b62260c5d0b31320b93844120a39f52 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 14:20:05 +0200 Subject: [PATCH 07/11] Support multiple navcontainers and related sidenav toggles. --- addon/components/paper-nav-container.js | 8 ++++---- addon/components/paper-sidenav-toggle.js | 4 ++-- tests/dummy/app/styles/app.scss | 2 +- tests/dummy/app/templates/application.hbs | 2 +- tests/dummy/app/templates/button.hbs | 2 +- tests/dummy/app/templates/card.hbs | 2 +- tests/dummy/app/templates/checkbox.hbs | 2 +- tests/dummy/app/templates/divider.hbs | 2 +- tests/dummy/app/templates/icons.hbs | 2 +- tests/dummy/app/templates/index.hbs | 2 +- tests/dummy/app/templates/input.hbs | 2 +- tests/dummy/app/templates/list-controls.hbs | 2 +- tests/dummy/app/templates/list.hbs | 2 +- tests/dummy/app/templates/radio.hbs | 2 +- tests/dummy/app/templates/sidenav.hbs | 2 +- tests/dummy/app/templates/slider.hbs | 2 +- tests/dummy/app/templates/switch.hbs | 2 +- tests/dummy/app/templates/toolbar.hbs | 2 +- tests/dummy/app/templates/typography.hbs | 2 +- tests/unit/components/paper-sidenav-toggle-test.js | 8 ++++---- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/addon/components/paper-nav-container.js b/addon/components/paper-nav-container.js index 215c5b79e..1e05155d5 100644 --- a/addon/components/paper-nav-container.js +++ b/addon/components/paper-nav-container.js @@ -13,13 +13,13 @@ export default Ember.Component.extend(FlexMixin, { _initialize: Ember.on('init', function(){ var eventBus = this.get("paperEventBus"); - eventBus.subscribe('paper:toggle-sidenav', this, 'toggleSidenav'); - eventBus.subscribe('paper:expand-sidenav', this, 'expandSidenav'); + eventBus.subscribe('paper:toggle-sidenav:' + (this.get('id') || ''), this, 'toggleSidenav'); + eventBus.subscribe('paper:expand-sidenav:' + (this.get('id') || ''), this, 'expandSidenav'); }), _tearDown: Ember.on('willDestroyElement', function(){ var eventBus = this.get("paperEventBus"); - eventBus.unsubscribe('toggleSidenav'); - eventBus.unsubscribe('expandSidenav'); + eventBus.unsubscribe(this.toggleSidenav); + eventBus.unsubscribe(this.expandSidenav); }), // Custom events diff --git a/addon/components/paper-sidenav-toggle.js b/addon/components/paper-sidenav-toggle.js index 1124dc3d9..b617c86d2 100644 --- a/addon/components/paper-sidenav-toggle.js +++ b/addon/components/paper-sidenav-toggle.js @@ -9,9 +9,9 @@ export default Ember.Component.extend({ click() { if (this.get('toggle')) { - this.get("paperEventBus").publish('paper:toggle-sidenav'); + this.get("paperEventBus").publish('paper:toggle-sidenav:' + (this.get("references") || '')); } else { - this.get("paperEventBus").publish('paper:expand-sidenav'); + this.get("paperEventBus").publish('paper:expand-sidenav:' + (this.get("references") || '')); } return false; } diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index c83427123..0a57ac5ae 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -128,7 +128,7 @@ body { width: 100%; height: 100%; } - + } /* *, *:before, *:after { diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index d81703cd2..023079329 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,4 +1,4 @@ -{{#paper-nav-container open=drawerOpen classNames="ember-app"}} +{{#paper-nav-container open=drawerOpen classNames="ember-app" id="main-sidebar"}} {{#paper-sidenav classNames="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}} diff --git a/tests/dummy/app/templates/button.hbs b/tests/dummy/app/templates/button.hbs index c44106259..535e8cae5 100644 --- a/tests/dummy/app/templates/button.hbs +++ b/tests/dummy/app/templates/button.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Buttons diff --git a/tests/dummy/app/templates/card.hbs b/tests/dummy/app/templates/card.hbs index 8739aef6f..66d02b606 100644 --- a/tests/dummy/app/templates/card.hbs +++ b/tests/dummy/app/templates/card.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Card diff --git a/tests/dummy/app/templates/checkbox.hbs b/tests/dummy/app/templates/checkbox.hbs index 8ae944a0d..1e436cbdb 100644 --- a/tests/dummy/app/templates/checkbox.hbs +++ b/tests/dummy/app/templates/checkbox.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Checkboxes diff --git a/tests/dummy/app/templates/divider.hbs b/tests/dummy/app/templates/divider.hbs index f8f86f459..d8353bd5d 100644 --- a/tests/dummy/app/templates/divider.hbs +++ b/tests/dummy/app/templates/divider.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Divider diff --git a/tests/dummy/app/templates/icons.hbs b/tests/dummy/app/templates/icons.hbs index bc0dad314..0d8ca933d 100644 --- a/tests/dummy/app/templates/icons.hbs +++ b/tests/dummy/app/templates/icons.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Material icons diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs index c8e5a39ef..5df5ed3fe 100644 --- a/tests/dummy/app/templates/index.hbs +++ b/tests/dummy/app/templates/index.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Introduction diff --git a/tests/dummy/app/templates/input.hbs b/tests/dummy/app/templates/input.hbs index 6aeb4b75a..17a5e44fb 100644 --- a/tests/dummy/app/templates/input.hbs +++ b/tests/dummy/app/templates/input.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Text fields diff --git a/tests/dummy/app/templates/list-controls.hbs b/tests/dummy/app/templates/list-controls.hbs index 83afcbe7c..774b24701 100644 --- a/tests/dummy/app/templates/list-controls.hbs +++ b/tests/dummy/app/templates/list-controls.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} List Controls diff --git a/tests/dummy/app/templates/list.hbs b/tests/dummy/app/templates/list.hbs index c600bbba8..9a0b6fd98 100644 --- a/tests/dummy/app/templates/list.hbs +++ b/tests/dummy/app/templates/list.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Lists diff --git a/tests/dummy/app/templates/radio.hbs b/tests/dummy/app/templates/radio.hbs index abaf553a6..cbea65d9f 100644 --- a/tests/dummy/app/templates/radio.hbs +++ b/tests/dummy/app/templates/radio.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Radio buttons diff --git a/tests/dummy/app/templates/sidenav.hbs b/tests/dummy/app/templates/sidenav.hbs index a7551c599..a070e0e40 100644 --- a/tests/dummy/app/templates/sidenav.hbs +++ b/tests/dummy/app/templates/sidenav.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Sidenav diff --git a/tests/dummy/app/templates/slider.hbs b/tests/dummy/app/templates/slider.hbs index 06f68bb0f..17f0f8192 100644 --- a/tests/dummy/app/templates/slider.hbs +++ b/tests/dummy/app/templates/slider.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Sliders diff --git a/tests/dummy/app/templates/switch.hbs b/tests/dummy/app/templates/switch.hbs index 2131ee103..0b85cd88b 100644 --- a/tests/dummy/app/templates/switch.hbs +++ b/tests/dummy/app/templates/switch.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Switches diff --git a/tests/dummy/app/templates/toolbar.hbs b/tests/dummy/app/templates/toolbar.hbs index 03fd2968d..a609213ee 100644 --- a/tests/dummy/app/templates/toolbar.hbs +++ b/tests/dummy/app/templates/toolbar.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Toolbars diff --git a/tests/dummy/app/templates/typography.hbs b/tests/dummy/app/templates/typography.hbs index 5e7a52ee4..700a217ad 100644 --- a/tests/dummy/app/templates/typography.hbs +++ b/tests/dummy/app/templates/typography.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} HTML Elements diff --git a/tests/unit/components/paper-sidenav-toggle-test.js b/tests/unit/components/paper-sidenav-toggle-test.js index 3e1eb2d51..452bc5e19 100644 --- a/tests/unit/components/paper-sidenav-toggle-test.js +++ b/tests/unit/components/paper-sidenav-toggle-test.js @@ -24,10 +24,10 @@ test('it renders', function(assert) { test('when clicked triggers `toggleSidenav` on navContainer', function(assert) { assert.expect(1); - var component = this.subject(); + var component = this.subject({references: 'main-sidebar'}); var didFire = false; - component.get('paperEventBus').subscribe('paper:toggle-sidenav', function () { + component.get('paperEventBus').subscribe('paper:toggle-sidenav:main-sidebar', function () { didFire = true; }); @@ -41,10 +41,10 @@ test('when clicked triggers `toggleSidenav` on navContainer', function(assert) { test('when clicked triggers `expandSidenav` if toggle is false on navContainer', function(assert) { assert.expect(1); - var component = this.subject({toggle: false}); + var component = this.subject({toggle: false, references: 'main-sidebar'}); var didFire = false; - component.get('paperEventBus').subscribe('paper:expand-sidenav', function () { + component.get('paperEventBus').subscribe('paper:expand-sidenav:main-sidebar', function () { didFire = true; }); From 96c7c858412fecf0a652b015a69418f0efe00e06 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 14:43:27 +0200 Subject: [PATCH 08/11] Rewrite to parentView. --- addon/components/paper-nav-container.js | 13 ----------- addon/components/paper-sidenav-toggle.js | 16 ++++++++++--- addon/initializers/ember-paper.js | 14 ----------- addon/services/paper-eventbus.js | 13 ----------- app/initializers/ember-paper.js | 2 -- tests/dummy/app/templates/application.hbs | 2 +- tests/dummy/app/templates/button.hbs | 2 +- tests/dummy/app/templates/card.hbs | 2 +- tests/dummy/app/templates/checkbox.hbs | 2 +- tests/dummy/app/templates/divider.hbs | 2 +- tests/dummy/app/templates/icons.hbs | 2 +- tests/dummy/app/templates/index.hbs | 2 +- tests/dummy/app/templates/input.hbs | 2 +- tests/dummy/app/templates/list-controls.hbs | 2 +- tests/dummy/app/templates/list.hbs | 2 +- tests/dummy/app/templates/radio.hbs | 2 +- tests/dummy/app/templates/sidenav.hbs | 2 +- tests/dummy/app/templates/slider.hbs | 2 +- tests/dummy/app/templates/switch.hbs | 2 +- tests/dummy/app/templates/toolbar.hbs | 2 +- tests/dummy/app/templates/typography.hbs | 2 +- .../components/paper-nav-container-test.js | 2 +- .../components/paper-sidenav-toggle-test.js | 23 +++++++++++-------- 23 files changed, 43 insertions(+), 72 deletions(-) delete mode 100644 addon/initializers/ember-paper.js delete mode 100644 addon/services/paper-eventbus.js delete mode 100644 app/initializers/ember-paper.js diff --git a/addon/components/paper-nav-container.js b/addon/components/paper-nav-container.js index 1e05155d5..b7763b29c 100644 --- a/addon/components/paper-nav-container.js +++ b/addon/components/paper-nav-container.js @@ -3,25 +3,12 @@ import FlexMixin from '../mixins/flex-mixin'; export default Ember.Component.extend(FlexMixin, { - paperEventBus: Ember.inject.service('paper-eventbus'), - tagName: 'md-nav-container', classNames: ['paper-nav-container'], classNameBindings: ['open:sidenav-expanded'], open: false, - _initialize: Ember.on('init', function(){ - var eventBus = this.get("paperEventBus"); - eventBus.subscribe('paper:toggle-sidenav:' + (this.get('id') || ''), this, 'toggleSidenav'); - eventBus.subscribe('paper:expand-sidenav:' + (this.get('id') || ''), this, 'expandSidenav'); - }), - _tearDown: Ember.on('willDestroyElement', function(){ - var eventBus = this.get("paperEventBus"); - eventBus.unsubscribe(this.toggleSidenav); - eventBus.unsubscribe(this.expandSidenav); - }), - // Custom events toggleSidenav() { this.toggleProperty('open'); diff --git a/addon/components/paper-sidenav-toggle.js b/addon/components/paper-sidenav-toggle.js index b617c86d2..400d7b894 100644 --- a/addon/components/paper-sidenav-toggle.js +++ b/addon/components/paper-sidenav-toggle.js @@ -1,17 +1,27 @@ import Ember from 'ember'; +import PaperNavContainer from './paper-nav-container'; export default Ember.Component.extend({ tagName: 'md-sidenav-toggle', classNames: ['paper-sidenav-toggle'], toggle: true, - paperEventBus: Ember.inject.service('paper-eventbus'), + navContainer: Ember.computed(function () { + var parentView = this.get("parentView"); + while(parentView) { + if (PaperNavContainer.detect(parentView.constructor)) { + return parentView; + } + parentView = parentView.get("parentView"); + } + }), click() { + var navContainer = this.get("navContainer"); if (this.get('toggle')) { - this.get("paperEventBus").publish('paper:toggle-sidenav:' + (this.get("references") || '')); + navContainer.toggleSidenav(); } else { - this.get("paperEventBus").publish('paper:expand-sidenav:' + (this.get("references") || '')); + navContainer.expandSidenav(); } return false; } diff --git a/addon/initializers/ember-paper.js b/addon/initializers/ember-paper.js deleted file mode 100644 index 79b8409a2..000000000 --- a/addon/initializers/ember-paper.js +++ /dev/null @@ -1,14 +0,0 @@ -import EventBus from '../services/paper-eventbus'; - -export function initialize(container, application) { - var eventBus = EventBus.create(); - application.register('paper-event-bus:current', eventBus, { - instantiate: false - }); - - application.inject('component', 'paper-eventbus', 'paper-event-bus:current'); -} -export default { - name: 'ember-paper', - initialize: initialize -}; diff --git a/addon/services/paper-eventbus.js b/addon/services/paper-eventbus.js deleted file mode 100644 index 3698be52f..000000000 --- a/addon/services/paper-eventbus.js +++ /dev/null @@ -1,13 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Service.extend(Ember.Evented, { - publish: function () { - return this.trigger.apply(this, arguments); - }, - subscribe: function () { - return this.on.apply(this, arguments); - }, - unsubscribe: function () { - return this.off.apply(this, arguments); - } -}); diff --git a/app/initializers/ember-paper.js b/app/initializers/ember-paper.js deleted file mode 100644 index e6ec9edee..000000000 --- a/app/initializers/ember-paper.js +++ /dev/null @@ -1,2 +0,0 @@ -import PaperInitializer from 'ember-paper/initializers/ember-paper'; -export default PaperInitializer; diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index 023079329..d81703cd2 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,4 +1,4 @@ -{{#paper-nav-container open=drawerOpen classNames="ember-app" id="main-sidebar"}} +{{#paper-nav-container open=drawerOpen classNames="ember-app"}} {{#paper-sidenav classNames="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}} diff --git a/tests/dummy/app/templates/button.hbs b/tests/dummy/app/templates/button.hbs index 535e8cae5..c44106259 100644 --- a/tests/dummy/app/templates/button.hbs +++ b/tests/dummy/app/templates/button.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Buttons diff --git a/tests/dummy/app/templates/card.hbs b/tests/dummy/app/templates/card.hbs index 66d02b606..8739aef6f 100644 --- a/tests/dummy/app/templates/card.hbs +++ b/tests/dummy/app/templates/card.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Card diff --git a/tests/dummy/app/templates/checkbox.hbs b/tests/dummy/app/templates/checkbox.hbs index 1e436cbdb..8ae944a0d 100644 --- a/tests/dummy/app/templates/checkbox.hbs +++ b/tests/dummy/app/templates/checkbox.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Checkboxes diff --git a/tests/dummy/app/templates/divider.hbs b/tests/dummy/app/templates/divider.hbs index d8353bd5d..f8f86f459 100644 --- a/tests/dummy/app/templates/divider.hbs +++ b/tests/dummy/app/templates/divider.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Divider diff --git a/tests/dummy/app/templates/icons.hbs b/tests/dummy/app/templates/icons.hbs index 0d8ca933d..bc0dad314 100644 --- a/tests/dummy/app/templates/icons.hbs +++ b/tests/dummy/app/templates/icons.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Material icons diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs index 5df5ed3fe..c8e5a39ef 100644 --- a/tests/dummy/app/templates/index.hbs +++ b/tests/dummy/app/templates/index.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Introduction diff --git a/tests/dummy/app/templates/input.hbs b/tests/dummy/app/templates/input.hbs index 17a5e44fb..6aeb4b75a 100644 --- a/tests/dummy/app/templates/input.hbs +++ b/tests/dummy/app/templates/input.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Text fields diff --git a/tests/dummy/app/templates/list-controls.hbs b/tests/dummy/app/templates/list-controls.hbs index 774b24701..83afcbe7c 100644 --- a/tests/dummy/app/templates/list-controls.hbs +++ b/tests/dummy/app/templates/list-controls.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} List Controls diff --git a/tests/dummy/app/templates/list.hbs b/tests/dummy/app/templates/list.hbs index 9a0b6fd98..c600bbba8 100644 --- a/tests/dummy/app/templates/list.hbs +++ b/tests/dummy/app/templates/list.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Lists diff --git a/tests/dummy/app/templates/radio.hbs b/tests/dummy/app/templates/radio.hbs index cbea65d9f..abaf553a6 100644 --- a/tests/dummy/app/templates/radio.hbs +++ b/tests/dummy/app/templates/radio.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Radio buttons diff --git a/tests/dummy/app/templates/sidenav.hbs b/tests/dummy/app/templates/sidenav.hbs index a070e0e40..a7551c599 100644 --- a/tests/dummy/app/templates/sidenav.hbs +++ b/tests/dummy/app/templates/sidenav.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Sidenav diff --git a/tests/dummy/app/templates/slider.hbs b/tests/dummy/app/templates/slider.hbs index 17f0f8192..06f68bb0f 100644 --- a/tests/dummy/app/templates/slider.hbs +++ b/tests/dummy/app/templates/slider.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Sliders diff --git a/tests/dummy/app/templates/switch.hbs b/tests/dummy/app/templates/switch.hbs index 0b85cd88b..2131ee103 100644 --- a/tests/dummy/app/templates/switch.hbs +++ b/tests/dummy/app/templates/switch.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Switches diff --git a/tests/dummy/app/templates/toolbar.hbs b/tests/dummy/app/templates/toolbar.hbs index a609213ee..03fd2968d 100644 --- a/tests/dummy/app/templates/toolbar.hbs +++ b/tests/dummy/app/templates/toolbar.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} Toolbars diff --git a/tests/dummy/app/templates/typography.hbs b/tests/dummy/app/templates/typography.hbs index 700a217ad..5e7a52ee4 100644 --- a/tests/dummy/app/templates/typography.hbs +++ b/tests/dummy/app/templates/typography.hbs @@ -1,6 +1,6 @@ {{#paper-toolbar}}

- {{#paper-sidenav-toggle class="menu-sidenav-toggle" references="main-sidebar"}} + {{#paper-sidenav-toggle class="menu-sidenav-toggle"}} {{paper-icon icon="menu"}} {{/paper-sidenav-toggle}} HTML Elements diff --git a/tests/unit/components/paper-nav-container-test.js b/tests/unit/components/paper-nav-container-test.js index d3d26a808..db16d0d21 100644 --- a/tests/unit/components/paper-nav-container-test.js +++ b/tests/unit/components/paper-nav-container-test.js @@ -6,7 +6,7 @@ import { moduleForComponent('paper-nav-container', 'PaperNavContainerComponent', { // specify the other units that are required for this test - needs: ['component:paper-backdrop', 'service:paper-eventbus'] + needs: ['component:paper-backdrop'] }); test('it renders', function(assert) { diff --git a/tests/unit/components/paper-sidenav-toggle-test.js b/tests/unit/components/paper-sidenav-toggle-test.js index 452bc5e19..115b0a362 100644 --- a/tests/unit/components/paper-sidenav-toggle-test.js +++ b/tests/unit/components/paper-sidenav-toggle-test.js @@ -6,7 +6,7 @@ import { moduleForComponent('paper-sidenav-toggle', 'PaperSidenavToggleComponent', { // specify the other units that are required for this test - needs: ['service:paper-eventbus'] + // needs: ['component:foo', 'helper:bar'] }); test('it renders', function(assert) { @@ -24,12 +24,14 @@ test('it renders', function(assert) { test('when clicked triggers `toggleSidenav` on navContainer', function(assert) { assert.expect(1); - var component = this.subject({references: 'main-sidebar'}); + var component = this.subject(); var didFire = false; - component.get('paperEventBus').subscribe('paper:toggle-sidenav:main-sidebar', function () { - didFire = true; - }); + component.set('navContainer', Ember.Object.create({ + toggleSidenav: function() { + didFire = true; + } + })); var $component = this.$(); Ember.run(function() { @@ -41,12 +43,13 @@ test('when clicked triggers `toggleSidenav` on navContainer', function(assert) { test('when clicked triggers `expandSidenav` if toggle is false on navContainer', function(assert) { assert.expect(1); - var component = this.subject({toggle: false, references: 'main-sidebar'}); + var component = this.subject({toggle: false}); var didFire = false; - - component.get('paperEventBus').subscribe('paper:expand-sidenav:main-sidebar', function () { - didFire = true; - }); + component.set('navContainer', Ember.Object.create({ + expandSidenav: function() { + didFire = true; + } + })); var $component = this.$(); Ember.run(function() { From 8834ba0c4d2a70369af77a7979e08b3c86c2352e Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 14:52:51 +0200 Subject: [PATCH 09/11] Re-add support for nearestOfType, this now works fine. --- addon/components/paper-sidenav-toggle.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addon/components/paper-sidenav-toggle.js b/addon/components/paper-sidenav-toggle.js index 400d7b894..07981c0a6 100644 --- a/addon/components/paper-sidenav-toggle.js +++ b/addon/components/paper-sidenav-toggle.js @@ -7,13 +7,7 @@ export default Ember.Component.extend({ toggle: true, navContainer: Ember.computed(function () { - var parentView = this.get("parentView"); - while(parentView) { - if (PaperNavContainer.detect(parentView.constructor)) { - return parentView; - } - parentView = parentView.get("parentView"); - } + return this.nearestOfType(PaperNavContainer); }), click() { From 9384755a0a5305480993de102d4ea598c215ed2e Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 14:57:20 +0200 Subject: [PATCH 10/11] Check for hasBlock on super if it exist, otherwise use template. --- addon/mixins/hasblock-mixin.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addon/mixins/hasblock-mixin.js b/addon/mixins/hasblock-mixin.js index 48490f492..f8ffa00c5 100644 --- a/addon/mixins/hasblock-mixin.js +++ b/addon/mixins/hasblock-mixin.js @@ -8,6 +8,9 @@ import Ember from 'ember'; */ export default Ember.Mixin.create({ hasBlock: Ember.computed(function () { - return !!this.get("template"); + if (typeof this._super.hasBlock === 'undefined') { + return !!this.get("template"); + } + return this.hasBlock; }) }); From 87ef88e4730856f948a2c5342129b6fe79302233 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Fri, 10 Jul 2015 15:04:12 +0200 Subject: [PATCH 11/11] Remove app/services/paper-eventbus.js. --- app/services/paper-eventbus.js | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/services/paper-eventbus.js diff --git a/app/services/paper-eventbus.js b/app/services/paper-eventbus.js deleted file mode 100644 index 286ad0dc6..000000000 --- a/app/services/paper-eventbus.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'ember-paper/services/paper-eventbus'; \ No newline at end of file