Skip to content

Commit

Permalink
Last RC before fixing this nightmare.
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Aug 25, 2017
1 parent b963f95 commit 2cd59b6
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = function (defaults) {
keyevent: {
vendor: {
srcDir: 'src',
destDir: 'keyevent',
destDir: 'ember-cli-text-support-mixins',
include: ['keyevent.js']
}
}
Expand All @@ -22,7 +22,7 @@ module.exports = function (defaults) {
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/
app.import('vendor/keyevent/keyevent.js');
app.import('vendor/ember-cli-text-support-mixins/keyevent.js');

return app.toTree();
};
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ module.exports = {
keyevent: {
vendor: {
srcDir: 'src',
destDir: 'keyevent',
destDir: 'ember-cli-text-support-mixins',
include: ['keyevent.js']
}
}
}
},
included: function (app) {
this._super.included.apply(this, arguments);
app.import('vendor/keyevent/keyevent.js');
app.import('vendor/ember-cli-text-support-mixins/keyevent.js');
}
};
31 changes: 31 additions & 0 deletions tests/dummy/app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,37 @@
</section>
<section>
<div class="container">
<fieldset>
<legend>Null Value Is Simply Empty</legend>
<div class="form-group">
<label for="js-null-is-empty" class="control-label">Null Is Empty</label>
{{text-area class="form-control" escapeKeyClears?=false id="js-null-is-empty"
placeholder="You should be able to read this placeholder"
value=null}}
<div class="help-block">
{{!-- formatter:off --}}
<pre>\{{text-area
class="form-control" escapeKeyClears?=false id="js-null-is-empty"
placeholder="You should be able to read this placeholder" value=null}}
</pre>
</div>
{{!-- formatter:on --}}
</div>
<div class="form-group">
<label for="js-undefined-is-empty" class="control-label">Undefined Is Empty</label>
{{text-area class="form-control" escapeKeyClears?=false id="js-undefined-is-empty"
placeholder="You should be able to read this placeholder"
value=undefined}}
<div class="help-block">
{{!-- formatter:off --}}
<pre>\{{text-area
class="form-control" escapeKeyClears?=false id="js-undefined-is-empty"
placeholder="You should be able to read this placeholder" value=undefined}}
</pre>
</div>
{{!-- formatter:on --}}
</div>
</fieldset>
<fieldset>
<legend>Focus Selects Text</legend>
<div class="form-group">
Expand Down

0 comments on commit 2cd59b6

Please sign in to comment.