Skip to content

Commit

Permalink
Revert back-compat changes, for now
Browse files Browse the repository at this point in the history
No polyfill for `setComponentTemplate()` yet so cannot support anything prior to 3.13. Reverting backwards compatibility (for now) to release a beta.
  • Loading branch information
Panman82 committed Nov 15, 2019
1 parent 1337f5a commit c63feb9
Show file tree
Hide file tree
Showing 9 changed files with 1,010 additions and 446 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ jobs:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
env: EMBER_TRY_SCENARIO=ember-3.13
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ember-froala-editor
Compatibility
------------------------------------------------------------------------------

* Ember.js v2.18 or above
* Ember.js v3.13 or above
* Ember CLI v2.15 or above
* Node.js v8 or above

Expand Down Expand Up @@ -776,6 +776,12 @@ likely require a different way to import components and helpers from this addon.
Moving to `ember-cli-addon-docs` but just haven't gotten to it yet. The "old"
docs site was not updated for 3.x so references here have been removed, for now.

#### Why does this addon only work with recent ember versions, 3.13+?
Due to the move to Glimmer Components, there is still work being done to support
backwards compatibility prior to 3.13, mainly a `setComponentTemplate()`
polyfill. Once that is complete, this addon *should* work going back to 2.18
by using several other polyfills.


Contributing
------------------------------------------------------------------------------
Expand Down
File renamed without changes.
6 changes: 1 addition & 5 deletions addon/components/froala-content.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import Component from '@glimmer/component';
import { setComponentTemplate } from '@ember/component';
import layout from '../templates/components/froala-content';

export class FroalaContentComponent extends Component {}

export default setComponentTemplate(layout, FroalaContentComponent);
export default class FroalaContentComponent extends Component {}
File renamed without changes.
11 changes: 3 additions & 8 deletions addon/components/froala-editor.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import { getOwner } from '@ember/application';
import { setComponentTemplate } from '@ember/component';
import { assert } from '@ember/debug';
import { action } from '@ember/object';
import { assign } from '@ember/polyfills';
import { isHTMLSafe } from '@ember/template';
import Component from '@glimmer/component';
import { froalaArg } from 'ember-froala-editor/helpers/froala-arg';
import { froalaHtml } from 'ember-froala-editor/helpers/froala-html';
import { froalaArg } from '../helpers/froala-arg';
import { froalaHtml } from '../helpers/froala-html';
import FroalaEditor from 'froala-editor';
import layout from '../templates/components/froala-editor';


export class FroalaEditorComponent extends Component {
export default class FroalaEditorComponent extends Component {


options = {};
Expand Down Expand Up @@ -299,6 +297,3 @@ export class FroalaEditorComponent extends Component {


}


export default setComponentTemplate(layout, FroalaEditorComponent);
12 changes: 2 additions & 10 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,10 @@ module.exports = async function() {
return {
scenarios: [
{
name: 'ember-lts-3.8',
name: 'ember-3.13',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
}
}
},
{
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.12.0'
'ember-source': '~3.13.0'
}
}
},
Expand Down
Loading

0 comments on commit c63feb9

Please sign in to comment.