Skip to content

Commit

Permalink
Ran ember-cli-update
Browse files Browse the repository at this point in the history
  • Loading branch information
sivakumar-kailasam committed May 28, 2018
1 parent 1de4b9c commit 27fc0d2
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 12 deletions.
1 change: 1 addition & 0 deletions .eslintignore
@@ -0,0 +1 @@
/blueprints/*/files/**/*.js
3 changes: 2 additions & 1 deletion .eslintrc.js
Expand Up @@ -20,8 +20,9 @@ module.exports = {
// node files
{
files: [
'testem.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js'
],
Expand Down
2 changes: 1 addition & 1 deletion app/adapters/application.js
Expand Up @@ -28,7 +28,7 @@ export default DS.JSONAPIAdapter.extend({
return this._super(...arguments);
}

let host = get(this, 'host');
let host = this.host;
let prefix = this.urlPrefix();

if (prefix) { url.unshift(prefix); }
Expand Down
2 changes: 1 addition & 1 deletion app/components/deprecation-article.js
Expand Up @@ -61,6 +61,6 @@ export default Component.extend({
currentToc.prepend(`<a class="toc-anchor" href="#${currentToc.attr('id')}"></a>`)
})

get(this, 'prism').highlight();
this.prism.highlight();
}
});
2 changes: 1 addition & 1 deletion app/components/table-of-contents.js
Expand Up @@ -5,7 +5,7 @@ export default Component.extend({
elementId: 'toc-list',
tagName: 'ol',
tocLevel: computed('level', function() {
return `level-${get(this, 'level')}`;
return `level-${this.level}`;
}),
level: '1',
});
4 changes: 2 additions & 2 deletions app/controllers/show.js
Expand Up @@ -10,7 +10,7 @@ export default Controller.extend({
},
groupedResults: computed('content.[]', function() {
let result = [];
this.get('content').forEach(function(item) {
this.content.forEach(function(item) {
let since = result.findBy('since', item.get('since'));
if(!since) {
result.pushObject(EmberObject.create({
Expand All @@ -23,7 +23,7 @@ export default Controller.extend({
return result;
}),
sortedGroupedResults: computed('groupedResults', function() {
let sorted = this.get('groupedResults').sort((a, b) => semverCompare(a.since, b.since));
let sorted = this.groupedResults.sort((a, b) => semverCompare(a.since, b.since));
let match = sorted[0].since.match(/Upcoming Features/)
if (match && match[0] == "Upcoming Features") {
let upComingFeatures = sorted.shift();
Expand Down
2 changes: 2 additions & 0 deletions config/targets.js
@@ -1,3 +1,5 @@
'use strict';

const browsers = [
'last 1 Chrome versions',
'last 1 Firefox versions',
Expand Down
8 changes: 4 additions & 4 deletions package.json
Expand Up @@ -13,15 +13,15 @@
"scripts": {
"build": "ember build",
"build-production": "ember build -e production",
"lint:js": "eslint ./*.js app config lib server tests",
"lint:js": "eslint ./*.js app blueprints config lib server tests",
"start": "ember serve",
"test": "ember test"
},
"devDependencies": {
"broccoli-asset-rev": "^2.6.0",
"broccoli-static-site-json": "^1.3.0",
"ember-ajax": "^3.0.0",
"ember-cli": "3.0.0",
"ember-cli": "~3.1.4",
"ember-cli-app-version": "^3.1.3",
"ember-cli-babel": "^6.11.0",
"ember-cli-cjs-transform": "^1.0.0",
Expand All @@ -39,14 +39,14 @@
"ember-cli-uglify": "^2.0.0",
"ember-cli-update": "^0.14.0",
"ember-collapsible-panel": "^2.1.1",
"ember-data": "~3.0.1",
"ember-data": "~3.1.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-maybe-import-regenerator": "0.1.6",
"ember-prism": "^0.2.0",
"ember-resolver": "^4.5.0",
"ember-set-body-class": "^0.3.0",
"ember-source": "~3.0.0",
"ember-source": "~3.1.0",
"ember-styleguide": "github:ember-learn/ember-styleguide#170e94742d310bd7cd28f1cb757c741816a58d16",
"eslint-plugin-ember": "^5.0.3",
"loader.js": "^4.6.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/components/table-of-contents-test.js
@@ -1,6 +1,6 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render } from '@ember/test-helpers';
import { render, find } from '@ember/test-helpers';
import hbs from 'htmlbars-inline-precompile';

module('Integration | Component | table of contents', function(hooks) {
Expand All @@ -12,7 +12,7 @@ module('Integration | Component | table of contents', function(hooks) {

await render(hbs`{{table-of-contents}}`);

assert.equal(this.$().text().trim(), '');
assert.equal(find('*').textContent.trim(), '');

});
});

0 comments on commit 27fc0d2

Please sign in to comment.