move templates to addon folder

miguelcobain · Jan 6, 2017 · f07be76 · f07be76
1 parent 1573949
commit f07be76
Show file tree

Hide file tree

Showing 106 changed files with 111 additions and 16 deletions.
diff --git a/addon/components/paper-autocomplete-content.js b/addon/components/paper-autocomplete-content.js
@@ -1,3 +1,6 @@
 import ContentComponent from 'ember-basic-dropdown/components/basic-dropdown/content';
+import layout from '../templates/components/paper-autocomplete-content';
 
-export default ContentComponent;
+export default ContentComponent.extend({
+  layout
+});
diff --git a/addon/components/paper-autocomplete-dropdown.js b/addon/components/paper-autocomplete-dropdown.js
@@ -1,9 +1,11 @@
 import Ember from 'ember';
 import BasicDropdown from 'ember-basic-dropdown/components/basic-dropdown';
+import layout from '../templates/components/paper-autocomplete-dropdown';
 
 const { $ } = Ember;
 
 export default BasicDropdown.extend({
+  layout,
   triggerComponent: 'paper-autocomplete-trigger-container',
 
   reposition() {

diff --git a/addon/components/paper-autocomplete-highlight.js b/addon/components/paper-autocomplete-highlight.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-autocomplete-highlight';
 
 const { Component, computed, String: { htmlSafe } } = Ember;
 
@@ -10,7 +11,9 @@ const { Component, computed, String: { htmlSafe } } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'span',
+
   flags: '',
 
   highlight: computed('searchText', 'label', 'flags', function() {

diff --git a/addon/components/paper-autocomplete-options.js b/addon/components/paper-autocomplete-options.js
@@ -1,9 +1,11 @@
 import Ember from 'ember';
 import PowerOptions from 'ember-power-select/components/power-select/options';
+import layout from '../templates/components/paper-autocomplete-options';
 
 const { get } = Ember;
 
 export default PowerOptions.extend({
+  layout,
 
   _optionFromIndex(index) {
     let parts = index.split('.');

diff --git a/addon/components/paper-autocomplete-trigger.js b/addon/components/paper-autocomplete-trigger.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
+import layout from '../templates/components/paper-autocomplete-trigger';
 
 const { Component, isPresent, isBlank, run, get, computed } = Ember;
 
 export default Component.extend({
+  layout,
   tagName: 'md-autocomplete-wrap',
   classNames: ['md-show-clear-button'],
   classNameBindings: ['noLabel:md-whiteframe-z1', 'select.isOpen:md-menu-showing'],

diff --git a/addon/components/paper-autocomplete.js b/addon/components/paper-autocomplete.js
@@ -3,6 +3,7 @@
  */
 import Ember from 'ember';
 import PowerSelect from 'ember-power-select/components/power-select';
+import layout from '../templates/components/paper-autocomplete';
 import ValidationMixin from 'ember-paper/mixins/validation-mixin';
 import ChildMixin from 'ember-paper/mixins/child-mixin';
 import { indexOfOption } from 'ember-power-select/utils/group-utils';
@@ -14,6 +15,7 @@ const { assert, computed, inject, isNone, defineProperty } = Ember;
  * @extends PowerSelectComponent
  */
 export default PowerSelect.extend(ValidationMixin, ChildMixin, {
+  layout,
   util: inject.service(),
   constants: inject.service(),
   triggerComponent: 'paper-autocomplete-trigger',

diff --git a/addon/components/paper-button.js b/addon/components/paper-button.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-button';
 import FocusableMixin from 'ember-paper/mixins/focusable-mixin';
 import RippleMixin from 'ember-paper/mixins/ripple-mixin';
 import ColorMixin from 'ember-paper/mixins/color-mixin';
@@ -18,6 +19,7 @@ const { Component, computed } = Ember;
  * @uses ProxiableMixin
  */
 export default Component.extend(FocusableMixin, RippleMixin, ColorMixin, ProxiableMixin, {
+  layout,
   tagName: 'button',
   classNames: ['md-default-theme', 'md-button'],
   raised: false,

diff --git a/addon/components/paper-card-actions.js b/addon/components/paper-card-actions.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card-actions';
 
 const { Component } = Ember;
 
@@ -10,6 +11,7 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-card-actions',
   classNameBindings: ['defaultClasses'],
 

diff --git a/addon/components/paper-card-header-text.js b/addon/components/paper-card-header-text.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card-header-text';
 
 const { Component } = Ember;
 
@@ -10,5 +11,6 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-card-header-text'
 });
diff --git a/addon/components/paper-card-header.js b/addon/components/paper-card-header.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card-header';
 
 const { Component } = Ember;
 
@@ -10,5 +11,6 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-card-header'
 });
diff --git a/addon/components/paper-card-media.js b/addon/components/paper-card-media.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card-media';
 
 const { Component } = Ember;
 
@@ -10,6 +11,7 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: '',
   size: 'md'
 });
diff --git a/addon/components/paper-card-title-media.js b/addon/components/paper-card-title-media.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card-title-media';
 
 const { Component } = Ember;
 
@@ -10,6 +11,7 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-card-title-media',
   size: 'md'
 });
diff --git a/addon/components/paper-card-title-text.js b/addon/components/paper-card-title-text.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card-title-text';
 
 const { Component } = Ember;
 
@@ -10,5 +11,6 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-card-title-text'
 });
diff --git a/addon/components/paper-card-title.js b/addon/components/paper-card-title.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card-title';
 
 const { Component } = Ember;
 
@@ -10,5 +11,6 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-card-title'
 });
diff --git a/addon/components/paper-card.js b/addon/components/paper-card.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-card';
 
 const { Component } = Ember;
 
@@ -10,5 +11,6 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-card'
 });
diff --git a/addon/components/paper-checkbox.js b/addon/components/paper-checkbox.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-checkbox';
 import FocusableMixin from 'ember-paper/mixins/focusable-mixin';
 import RippleMixin from 'ember-paper/mixins/ripple-mixin';
 import ColorMixin from 'ember-paper/mixins/color-mixin';
@@ -18,6 +19,7 @@ const { Component, inject, assert } = Ember;
  * @uses ProxiableMixin
  */
 export default Component.extend(FocusableMixin, RippleMixin, ColorMixin, ProxiableMixin, {
+  layout,
   tagName: 'md-checkbox',
   classNames: ['md-checkbox', 'md-default-theme'],
   classNameBindings: ['value:md-checked'],

diff --git a/addon/components/paper-chips.js b/addon/components/paper-chips.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
+import layout from '../templates/components/paper-chips';
 
 const { Component, isEmpty, isPresent, computed, observer, run } = Ember;
 
 export default Component.extend({
+  layout,
   tagName: 'md-chips',
   classNames: ['md-default-theme'],
   activeChip: -1,

diff --git a/addon/components/paper-contact-chips.js b/addon/components/paper-contact-chips.js
@@ -1,6 +1,8 @@
 import PaperChips from 'ember-paper/components/paper-chips';
+import layout from '../templates/components/paper-contact-chips';
 
 export default PaperChips.extend({
+  layout,
   tagName: 'md-contact-chips',
   classNames: ['md-default-theme'],
   requireMatch: true,

diff --git a/addon/components/paper-dialog.js b/addon/components/paper-dialog.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-dialog';
 
 const { $, Component, computed, inject } = Ember;
 
@@ -10,6 +11,7 @@ const { $, Component, computed, inject } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: '',
 
   escapeToClose: true,

diff --git a/addon/components/paper-form.js b/addon/components/paper-form.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-form';
 import ParentMixin from 'ember-paper/mixins/parent-mixin';
 
 const { Component, computed } = Ember;
@@ -12,6 +13,7 @@ const { Component, computed } = Ember;
  * @uses ParentMixin
  */
 export default Component.extend(ParentMixin, {
+  layout,
   tagName: '',
   isValid: computed.not('isInvalid'),
   isInvalid: computed('childComponents.@each.isInvalid', function() {

diff --git a/addon/components/paper-grid-list.js b/addon/components/paper-grid-list.js
@@ -60,7 +60,7 @@ export default Component.extend({
     this.get('tiles').addObject(gridTile);
   },
 
-  layout() {
+  doLayout() {
     try {
       let tilesInvalidated = this.get('tilesInvalidated');
       this._layoutDelegate(tilesInvalidated);
@@ -337,7 +337,7 @@ export default Component.extend({
         return;
       }
       this.set('layoutInvalidated', true);
-      run.next(this, this.layout);
+      run.next(this, this.doLayout);
     }
   }
 });
diff --git a/addon/components/paper-grid-tile-footer.js b/addon/components/paper-grid-tile-footer.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-grid-tile-footer';
 
 const { Component } = Ember;
 
@@ -10,5 +11,6 @@ const { Component } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-grid-tile-footer'
 });
diff --git a/addon/components/paper-grid-tile.js b/addon/components/paper-grid-tile.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-grid-tile';
 import PaperGridList from './paper-grid-list';
 
 const { Component, computed, inject, get } = Ember;
@@ -11,6 +12,7 @@ const { Component, computed, inject, get } = Ember;
  * @extends Ember.Component
  */
 export default Component.extend({
+  layout,
   tagName: 'md-grid-tile',
 
   constants: inject.service(),

diff --git a/addon/components/paper-icon.js b/addon/components/paper-icon.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-icon';
 import ColorMixin from 'ember-paper/mixins/color-mixin';
 
 const { Component, computed, String: Str } = Ember;
@@ -12,6 +13,7 @@ const { Component, computed, String: Str } = Ember;
  * @uses ColorMixin
  */
 let PaperIconComponent = Component.extend(ColorMixin, {
+  layout,
   tagName: 'md-icon',
   classNames: ['paper-icon', 'md-font', 'material-icons', 'md-default-theme'],
   classNameBindings: ['spinClass'],

diff --git a/addon/components/paper-input.js b/addon/components/paper-input.js
@@ -2,14 +2,13 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-input';
 import FocusableMixin from 'ember-paper/mixins/focusable-mixin';
 import ColorMixin from 'ember-paper/mixins/color-mixin';
 import ChildMixin from 'ember-paper/mixins/child-mixin';
 import ValidationMixin from 'ember-paper/mixins/validation-mixin';
 
-const {
-  Component, $, computed, isEmpty, run, assert
-} = Ember;
+const { Component, $, computed, isEmpty, run, assert } = Ember;
 
 /**
  * @class PaperInput
@@ -20,6 +19,7 @@ const {
  * @uses ValidationMixin
  */
 export default Component.extend(FocusableMixin, ColorMixin, ChildMixin, ValidationMixin, {
+  layout,
   tagName: 'md-input-container',
   classNames: ['md-default-theme'],
   classNameBindings: [

diff --git a/addon/components/paper-item.js b/addon/components/paper-item.js
@@ -2,6 +2,7 @@
  * @module ember-paper
  */
 import Ember from 'ember';
+import layout from '../templates/components/paper-item';
 import RippleMixin from '../mixins/ripple-mixin';
 import { ParentMixin } from 'ember-composability-tools';
 
@@ -14,6 +15,7 @@ const { Component, computed } = Ember;
  * @uses RippleMixin
  */
 export default Component.extend(RippleMixin, ParentMixin, {
+  layout,
   tagName: 'md-list-item',
 
   // Ripple Overrides