Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 93 additions & 48 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,108 @@ module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
sourceType: "module"
},
plugins: ['ember'],
extends: 'eslint:recommended',
plugins: ["ember"],
extends: ["eslint:recommended", "plugin:ember/recommended"],
env: {
'browser': true
browser: true
},
globals: {
'heimdall': true,
'FastBoot': true
heimdall: true,
FastBoot: true
},
rules: {
'ember/no-jquery': 'off',
'no-unused-vars': ['error', {
'args': 'none',
}],
"ember/no-jquery": "off",
"no-unused-vars": [
"error",
{
args: "none"
}
],

// from JSHint
'no-cond-assign': ['error', 'except-parens'],
'eqeqeq': 'error',
'no-eval': 'error',
'new-cap': ['error', {
'capIsNew': false,
}],
'no-caller': 'error',
'no-irregular-whitespace': 'error',
'no-undef': 'error',
'no-eq-null': 'error',
"no-cond-assign": ["error", "except-parens"],
eqeqeq: "error",
"no-eval": "error",
"new-cap": [
"error",
{
capIsNew: false
}
],
"no-caller": "error",
"no-irregular-whitespace": "error",
"no-undef": "error",
"no-eq-null": "error",

// from JSCS
'array-bracket-spacing': ['error', 'never'],
'comma-style': ['error', 'last'],
'brace-style': ['error', '1tbs', {
'allowSingleLine': true,
}],
'no-spaced-func': 'error',
'no-empty': 'error',
'curly': ['error', 'all'],
'eol-last': 'error',
'no-trailing-spaces': 'error',
'comma-dangle': ['error', 'never'],
'space-before-blocks': ['error', 'always'],
'indent': ['error', 2, {
'SwitchCase': 1,
}],
'keyword-spacing': ['error', {
'overrides': {
'else': {
'before': true,
},
'while': {
'before': true,
},
'catch': {
'before': true,
},
"array-bracket-spacing": ["error", "never"],
"comma-style": ["error", "last"],
"brace-style": [
"error",
"1tbs",
{
allowSingleLine: true
}
],
"no-spaced-func": "error",
"no-empty": "error",
curly: ["error", "all"],
"eol-last": "error",
"no-trailing-spaces": "error",
"comma-dangle": ["error", "never"],
"space-before-blocks": ["error", "always"],
indent: [
"error",
2,
{
SwitchCase: 1
}
],
"keyword-spacing": [
"error",
{
overrides: {
else: {
before: true
},
while: {
before: true
},
catch: {
before: true
}
}
}
]
},
overrides: [
// node files
{
files: [
"testem.js",
"ember-cli-build.js",
"config/**/*.js",
"lib/*/index.js"
],
parserOptions: {
sourceType: "script",
ecmaVersion: 2015
},
}],
}
env: {
browser: false,
node: true
}
},

// test files
{
files: ["tests/**/*.js"],
excludedFiles: ["tests/dummy/**/*.js"],
env: {
embertest: true
}
}
]
};
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ addons:
cache:
yarn: true

env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1
- export PATH=$HOME/.yarn/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion app/components/api-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Component from '@ember/component';

export default Component.extend({

sections: computed('itemData.methods', 'itemData.properties', 'itemData.events', function () {
sections: computed('itemData.{methods,properties,events}', function () {
return [
{
title: 'Methods',
Expand Down
2 changes: 1 addition & 1 deletion app/components/class-field-description.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { computed } from '@ember/object';
export default Component.extend({
legacyModuleMappings: service(),

hasImportExample: computed('field.name', 'field.class', function () {
hasImportExample: computed('field.{name,class}', function () {
return this.get('legacyModuleMappings').hasFunctionMapping(this.get('field.name'), this.get('field.class'));
}),

Expand Down
8 changes: 4 additions & 4 deletions app/components/search-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { A } from '@ember/array';
import { alias } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import Component from '@ember/component';
import get from 'ember-metal/get';
import set from 'ember-metal/set';
import { get } from '@ember/object';
import { set } from '@ember/object';
import { task, timeout } from 'ember-concurrency';

const SEARCH_DEBOUNCE_PERIOD = 300;
Expand All @@ -22,12 +22,12 @@ export default Component.extend({
_projectVersion: alias('_projectService.version'),
_results: A(),
_focused: false,
_resultTetherConstraints: [
_resultTetherConstraints: Object.freeze([
{
to: 'window',
pin: ['left','right']
}
],
]),

search: task(function * (query) {

Expand Down
6 changes: 5 additions & 1 deletion app/components/search-input/dropdown-result.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ import { computed } from '@ember/object';
import Component from '@ember/component';

export default Component.extend({
init() {
this._super(...arguments);
this.set("result", {});
},
// Public API
result: {},
result: null,
role: 'option',
groupName: '',
groupPosition: 0, // Index of this result in the grouped results
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/project-version.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import { alias } from '@ember/object/computed';
import { alias, readOnly } from '@ember/object/computed';
import { A } from '@ember/array';
import { inject as service } from '@ember/service';
import values from 'npm:lodash.values';
Expand All @@ -17,7 +17,7 @@ export default Controller.extend(FilterParams, {

project: service(),

showPrivateClasses: computed.alias('filterData.sideNav.showPrivate'),
showPrivateClasses: alias('filterData.sideNav.showPrivate'),

classesIDs: computed('model', function() {
return this.getRelationshipIDs('classes');
Expand Down Expand Up @@ -92,5 +92,5 @@ export default Controller.extend(FilterParams, {
return this.get('projectVersions').filter(pV => pV.id === this.get('model.version'))[0];
}),

activeProject: computed.readOnly('model.project.id')
activeProject: readOnly('model.project.id')
});
6 changes: 3 additions & 3 deletions app/controllers/project-version/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion app/controllers/project-version/modules/module.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { alias } from '@ember/object/computed';
import { computed } from '@ember/object';
import { inject as service } from '@ember/service';
import ClassController from '../classes/class';
Expand All @@ -6,7 +7,7 @@ import union from 'npm:lodash.union';

export default ClassController.extend({
filterData: service(),
showPrivateClasses: computed.alias('filterData.sideNav.showPrivate'),
showPrivateClasses: alias('filterData.sideNav.showPrivate'),

submodules: computed('model', function() {
return Object.keys(this.get('model.submodules'));
Expand Down
5 changes: 2 additions & 3 deletions app/helpers/better-get.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Ember from 'ember';

import { helper } from '@ember/component/helper';
/**
* gives a similar functionality to the get helper, but it supports dot separated
* object keys.
Expand All @@ -8,4 +7,4 @@ export function betterGet(params/*, hash*/) {
return params[0][params[1]];
}

export default Ember.Helper.helper(betterGet);
export default helper(betterGet);
5 changes: 2 additions & 3 deletions app/helpers/version-lt.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Ember from 'ember';

import { helper } from '@ember/component/helper';
/**
* Converts a compact version string like '2.16' into an int array [2, 16]
*/
Expand All @@ -24,5 +23,5 @@ export function versionLt(params/*, hash*/) {
minor(currentVersionArray) < minor(compareToVersionArray));
}

export default Ember.Helper.helper(versionLt);
export default helper(versionLt);

3 changes: 2 additions & 1 deletion app/mixins/parent-name.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { readOnly } from '@ember/object/computed';
import { computed } from '@ember/object';
import Mixin from '@ember/object/mixin';
import { inject as service } from '@ember/service';

export default Mixin.create({
router: service('-routing'),

routeName: computed.readOnly('router.currentRouteName'),
routeName: readOnly('router.currentRouteName'),
parentName: computed('routeName', function() {
const routeName = this.get('routeName');
const routes = routeName.split('.');
Expand Down
12 changes: 8 additions & 4 deletions app/services/filter-data.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import Service from '@ember/service';
import Service from "@ember/service";

export default Service.extend({
init() {
this._super(...arguments);
this.set("sideNav",{
showPrivate: false
});
},
showInherited: false,
showProtected: false,
showPrivate: false,
showDeprecated: false,
sideNav: {
showPrivate: false
}
sideNav: null
});
4 changes: 2 additions & 2 deletions app/services/legacy-module-mappings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from 'ember';
import Service from '@ember/service';
import fetch from 'fetch';
import { task } from 'ember-concurrency';
import config from 'ember-api-docs/config/environment';
Expand All @@ -9,7 +9,7 @@ const LOCALNAME_CONVERSIONS = {
Error: 'EmberError'
};

export default Ember.Service.extend({
export default Service.extend({

init() {
this.get('initMappings').perform();
Expand Down
14 changes: 9 additions & 5 deletions app/services/meta-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ import { A } from '@ember/array';
import getCompactVersion from 'ember-api-docs/utils/get-compact-version';

export default Service.extend({

availableProjectVersions: {
'ember': A(),
'ember-data':A()
init() {
this._super(...arguments);
this.set("availableProjectVersions", {
'ember': A(),
'ember-data':A()
});
this.set("projectRevMap", {})
},
availableProjectVersions: null,

projectRevMap: {},
projectRevMap: null,

addToProjectRevMap(projectVersionKey, projectRevDoc) {
let projectRevMap = this.get('projectRevMap');
Expand Down
2 changes: 1 addition & 1 deletion app/styles/base/_buttons.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#{$all-button-inputs},
#{$all-buttons},
button {
appearance: none;;
-webkit-font-smoothing: antialiased;
Expand Down
2 changes: 1 addition & 1 deletion app/styles/components/_article.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ article {
}

.edit-page {
@include size(24px 18px);
@include size(24px, 18px);
color: $brown;
display: inline-block;
float: right;
Expand Down
2 changes: 1 addition & 1 deletion app/styles/components/_highlight.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

.ribbon {
@include position(absolute, 0.33em -1px null null);
@include size(52px 20px);
@include size(52px, 20px);
background: 0 0 no-repeat;
background-size: 52px 20px;
z-index: 9;
Expand Down
Loading