diff --git a/addon/components/mdl-nav-content.js b/addon/components/mdl-nav-content.js
new file mode 100644
index 00000000..006d31e2
--- /dev/null
+++ b/addon/components/mdl-nav-content.js
@@ -0,0 +1,11 @@
+import BaseComponent from './-base-toplevel-component';
+import layout from '../templates/components/mdl-nav-content';
+
+export default BaseComponent.extend({
+
+ layout,
+ _jsClass: false,
+ tagName: 'main',
+ primaryClassName: 'layout__content'
+
+});
\ No newline at end of file
diff --git a/addon/components/mdl-nav-drawer.js b/addon/components/mdl-nav-drawer.js
new file mode 100644
index 00000000..7d4e16cd
--- /dev/null
+++ b/addon/components/mdl-nav-drawer.js
@@ -0,0 +1,11 @@
+import BaseComponent from './-base-toplevel-component';
+import layout from '../templates/components/mdl-nav-drawer';
+
+export default BaseComponent.extend({
+
+ layout,
+ _jsClass: false,
+ tagName: 'div',
+ primaryClassName: 'layout__drawer'
+
+});
\ No newline at end of file
diff --git a/addon/components/mdl-nav-header.js b/addon/components/mdl-nav-header.js
new file mode 100644
index 00000000..82d3ad25
--- /dev/null
+++ b/addon/components/mdl-nav-header.js
@@ -0,0 +1,21 @@
+import Ember from 'ember';
+import layout from '../templates/components/mdl-nav-header';
+import ShadowSupport from '../mixins/shadow-support';
+
+const { Component } = Ember;
+
+export default Component.extend(ShadowSupport, {
+
+ layout,
+ tagName: 'header',
+ classNames: ['mdl-layout__header'],
+ classNameBindings: [
+ 'waterfallMenu:mdl-layout__header--waterfall',
+ 'scroll:mdl-layout__header--scroll',
+ 'transparent:mdl-layout__header--transparent'
+ ],
+ waterfallMenu: false,
+ scroll: false,
+ transparent: false
+
+});
\ No newline at end of file
diff --git a/addon/components/mdl-nav-item.js b/addon/components/mdl-nav-item.js
index 1e366f4a..cd94e0c3 100644
--- a/addon/components/mdl-nav-item.js
+++ b/addon/components/mdl-nav-item.js
@@ -1,10 +1,10 @@
import Ember from 'ember';
-import ChildComponentSupport from 'ember-composability/mixins/child-component-support';
-import ClickActionSupport from '../mixins/click-action-support';
-import MdlNav from './mdl-nav';
-
-export default Ember.Component.extend(ChildComponentSupport, ClickActionSupport, {
- _parentComponentTypes: Ember.A([MdlNav]),
- inDrawer: true,
- inHeader: true
-});
+import layout from '../templates/components/mdl-nav-item';
+
+const { Component } = Ember;
+
+export default Component.extend({
+
+ layout
+
+});
\ No newline at end of file
diff --git a/addon/components/mdl-nav-menu.js b/addon/components/mdl-nav-menu.js
new file mode 100644
index 00000000..8b06ca92
--- /dev/null
+++ b/addon/components/mdl-nav-menu.js
@@ -0,0 +1,11 @@
+import BaseComponent from './-base-toplevel-component';
+import layout from '../templates/components/mdl-nav-menu';
+
+export default BaseComponent.extend({
+
+ layout,
+ _jsClass: false,
+ tagName: 'nav',
+ primaryClassName: 'navigation'
+
+});
\ No newline at end of file
diff --git a/addon/components/mdl-nav.js b/addon/components/mdl-nav.js
index ba7f6d67..c1f7274e 100644
--- a/addon/components/mdl-nav.js
+++ b/addon/components/mdl-nav.js
@@ -1,54 +1,21 @@
-import Ember from 'ember';
-import ParentComponentSupport from 'ember-composability/mixins/parent-component-support';
import BaseComponent from './-base-toplevel-component';
import layout from '../templates/components/mdl-nav';
-let { computed, computed: { oneWay } } = Ember;
-
-export default BaseComponent.extend(ParentComponentSupport, {
+export default BaseComponent.extend({
primaryClassName: 'layout',
- composableChildrenDebounceTime: 1,
classNameBindings: [
'fixedHeader:mdl-layout--fixed-header:mdl-layout--overlay-drawer-button',
'fixedDrawer:mdl-layout--fixed-drawer'
],
layout,
- title: null,
- mobileTitle: oneWay('title'),
fixedHeader: false,
fixedDrawer: false,
- transparent: false,
- waterfallMenu: false,
- scrollHeader: false,
- includeHeader: true,
- includeHeaderLinks: true,
- includeDrawer: true,
- includeDrawerTitle: true,
_mdlComponent: null,
- _drawerNavItems: computed('composableChildren.[]', 'composableChildren.@each.inDrawer', function() {
- return Ember.A(this.get('composableChildren').filter(x => x.inDrawer));
- }),
- _headerNavItems: computed('composableChildren.[]', 'composableChildren.@each.inHeader', function() {
- return Ember.A(this.get('composableChildren').filter(x => x.inHeader));
- }),
-
- _headerClassString: computed('waterfallMenu', function() {
- let classes = ['mdl-layout__header'];
- if (this.get('waterfallMenu')) {
- classes.push('mdl-layout__header--waterfall');
- }
- if (this.get('scrollHeader')) {
- classes.push('mdl-layout__header--scroll');
- }
- if (this.get('transparent')) {
- classes.push('mdl-layout__header--transparent');
- }
- return classes.join(' ');
- }),
didInsertElement() {
this._super(...arguments);
let mdlnav = new window.MaterialLayout(this.get('element'));
this.set('_mdlComponent', mdlnav);
}
-});
+
+});
\ No newline at end of file
diff --git a/addon/components/mdl-table-col.js b/addon/components/mdl-table-col.js
index 7685abc1..40a9b999 100644
--- a/addon/components/mdl-table-col.js
+++ b/addon/components/mdl-table-col.js
@@ -15,7 +15,7 @@ export default BaseComponent.extend(ChildComponentSupport, {
if (isEmpty(childComponents)) {
return true;
} else {
- const labels = parentComponent.getComposableChildren().map(x => x.label);
+ const labels = parentComponent.getComposableChildren().map((x) => x.label);
return labels.indexOf(this.get('label')) < 0;
}
}
diff --git a/addon/components/mdl-tabs.js b/addon/components/mdl-tabs.js
index d7088d7a..319e9e25 100644
--- a/addon/components/mdl-tabs.js
+++ b/addon/components/mdl-tabs.js
@@ -15,7 +15,7 @@ export default BaseComponent.extend(ParentComponentSupport, RippleSupport, {
this._super(...arguments);
let mdltabs = new window.MaterialTabs(this.get('element'));
this.set('_mdlComponent', mdltabs);
- let [activeTab] = this.get('composableChildren').filter(x => x.title === this.get('active'));
+ let [activeTab] = this.get('composableChildren').filter((x) => x.title === this.get('active'));
if (activeTab) {
activeTab.set('isActive', true);
}
@@ -23,7 +23,7 @@ export default BaseComponent.extend(ParentComponentSupport, RippleSupport, {
actions: {
tabClicked(tab) {
- let [activeTab] = this.get('composableChildren').filter(x => x.title === this.get('active'));
+ let [activeTab] = this.get('composableChildren').filter((x) => x.title === this.get('active'));
if (activeTab) {
activeTab.set('isActive', false);
}
diff --git a/addon/templates/components/mdl-nav-content.hbs b/addon/templates/components/mdl-nav-content.hbs
new file mode 100644
index 00000000..3eedbd7d
--- /dev/null
+++ b/addon/templates/components/mdl-nav-content.hbs
@@ -0,0 +1 @@
+{{ yield }}
\ No newline at end of file
diff --git a/addon/templates/components/mdl-nav-drawer.hbs b/addon/templates/components/mdl-nav-drawer.hbs
new file mode 100644
index 00000000..4ea898db
--- /dev/null
+++ b/addon/templates/components/mdl-nav-drawer.hbs
@@ -0,0 +1,4 @@
+{{#if mobileTitle}}
+ {{ mobileTitle }}
+{{/if}}
+{{ yield }}
\ No newline at end of file
diff --git a/addon/templates/components/mdl-nav-header.hbs b/addon/templates/components/mdl-nav-header.hbs
new file mode 100644
index 00000000..3069d2e1
--- /dev/null
+++ b/addon/templates/components/mdl-nav-header.hbs
@@ -0,0 +1,3 @@
+
+ {{ yield }}
+
\ No newline at end of file
diff --git a/addon/templates/components/mdl-nav-item.hbs b/addon/templates/components/mdl-nav-item.hbs
new file mode 100644
index 00000000..3119938e
--- /dev/null
+++ b/addon/templates/components/mdl-nav-item.hbs
@@ -0,0 +1 @@
+{{link-to name route class="mdl-navigation__link"}}
\ No newline at end of file
diff --git a/addon/templates/components/mdl-nav-menu.hbs b/addon/templates/components/mdl-nav-menu.hbs
new file mode 100644
index 00000000..3eedbd7d
--- /dev/null
+++ b/addon/templates/components/mdl-nav-menu.hbs
@@ -0,0 +1 @@
+{{ yield }}
\ No newline at end of file
diff --git a/addon/templates/components/mdl-nav.hbs b/addon/templates/components/mdl-nav.hbs
index 019e7bee..3eedbd7d 100644
--- a/addon/templates/components/mdl-nav.hbs
+++ b/addon/templates/components/mdl-nav.hbs
@@ -1,32 +1 @@
-{{#if includeHeader}}
-
-
+ Bacon ipsum dolor amet pork loin cow pancetta, t-bone leberkas jerky pork belly. Corned beef kielbasa t-bone, ham prosciutto ribeye chicken filet mignon pork loin turducken flank short ribs beef pancetta kevin. Swine pancetta salami frankfurter alcatra filet mignon. Bresaola pastrami hamburger turkey short loin. Andouille pig turducken, pork chop ham tongue pork capicola. Swine venison brisket, pork belly turkey doner chicken rump short loin.
+ Tail shoulder cupim, tenderloin bacon short ribs ball tip alcatra sirloin ground round salami spare ribs kevin. Ground round meatball chuck kevin sirloin jerky tail ham. Filet mignon beef brisket boudin ball tip meatloaf shank. Tail tri-tip shankle bacon short ribs pork chop fatback cupim prosciutto andouille sausage turducken chicken filet mignon. Salami jowl fatback shank spare ribs. Boudin ground round ham, ball tip meatloaf tenderloin beef.
+ Fatback flank ball tip corned beef. Ball tip spare ribs kielbasa bresaola turkey venison salami leberkas chicken jerky picanha sausage pork. Shoulder doner frankfurter jerky corned beef, alcatra beef ribs venison flank brisket short loin. Pastrami porchetta shoulder, short ribs ground round jowl doner meatball meatloaf sirloin. Capicola leberkas jowl, sausage pancetta chuck ham hock swine tail pork chop venison porchetta jerky brisket. Pig shankle filet mignon shank meatball. Prosciutto drumstick leberkas spare ribs, bacon ball tip pork chop hamburger t-bone.
+
+
+ {{/mdl-nav-content}}
{{/mdl-nav}}
\ No newline at end of file
diff --git a/tests/dummy/app/templates/tooltips.hbs b/tests/dummy/app/templates/tooltips.hbs
index 342f8b8c..d1ea8dd5 100644
--- a/tests/dummy/app/templates/tooltips.hbs
+++ b/tests/dummy/app/templates/tooltips.hbs
@@ -3,4 +3,4 @@
{{#x-example snippet='mdl-tooltip' title='Tooltip' cols=12}}
Tooltips are attached to an element with an id, or CSS selector using the for attribute. Tooltip bodies can contain rich content, including multi-line text and icons.
-{{/x-example}}
+{{/x-example}}
\ No newline at end of file
diff --git a/tests/integration/components/mdl-button-test.js b/tests/integration/components/mdl-button-test.js
index 24f63aea..7e4ae028 100644
--- a/tests/integration/components/mdl-button-test.js
+++ b/tests/integration/components/mdl-button-test.js
@@ -28,7 +28,7 @@ test('fires action "action" on click by default', function(assert) {
// Set any properties with this.set('myProperty', 'value');
// Handle any actions with this.on('myAction', function(val) { ... });
- this.on('buttonClicked', val => {
+ this.on('buttonClicked', (val) => {
assert.ok(val.element.className.indexOf('this-is-my-button') >= 0, 'Button component is passed as argument to action');
});
@@ -46,7 +46,7 @@ test('does not fire action when disabled', function(assert) {
// Set any properties with this.set('myProperty', 'value');
// Handle any actions with this.on('myAction', function(val) { ... });
let clickCount = 0;
- this.on('buttonClicked', val => {
+ this.on('buttonClicked', (val) => {
clickCount++;
});