Skip to content

Commit

Permalink
Merge branch 'master' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
patricklx committed Jun 15, 2020
2 parents f9d4d9d + 4e991aa commit df63bf2
Show file tree
Hide file tree
Showing 12 changed files with 292 additions and 601 deletions.
32 changes: 17 additions & 15 deletions app/components/app-picker.hbs
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<div class="h-7 text-base13">
<select
class="box-border block w-full h-full m-0 border-0 pr-4 pl-1 text-base text-base13 bg-transparent appearance-none outline-none"
{{on 'change' this.selectApp}}
>
{{#each-in this.apps as |id name|}}
<option
value={{id}}
selected={{eq id this.selectedAppId}}
>
{{name}}
</option>
{{/each-in}}
</select>
{{svg-jar "dropdown-arrow" class="dropdown__arrow fill-current absolute opacity-75 pointer-events-none"}}
<div class="app-picker">
<div class="h-7 text-base13">
<select
class="box-border block w-full h-full m-0 border-0 pr-4 pl-1 text-base text-base13 bg-transparent appearance-none outline-none"
{{on 'change' this.selectApp}}
>
{{#each-in this.apps as |id name|}}
<option
value={{id}}
selected={{eq id this.selectedAppId}}
>
{{name}}
</option>
{{/each-in}}
</select>
{{svg-jar "dropdown-arrow" class="dropdown__arrow fill-current absolute opacity-75 pointer-events-none"}}
</div>
</div>
30 changes: 18 additions & 12 deletions app/components/app-picker.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
import Component from '@ember/component';
import { alias, reads } from '@ember/object/computed';
import Component from '@glimmer/component';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';

export default Component.extend({
classNames: ['app-picker'],
export default class AppPickerComponent extends Component {
@service port;

apps: alias('port.detectedApplications'),
selectedAppId: reads('port.applicationId'),
get apps() {
return this.port.detectedApplications;
}

init() {
this._super(...arguments);
get selectedAppId() {
return this.port.applicationId;
}

constructor() {
super(...arguments);
this.port.send('app-picker-loaded');
},
}

selectApp: action(function (event) {
@action
selectApp(event) {
let applicationId = event.target.value;
this.port.selectApplication(applicationId);
}),
});
}
}
14 changes: 6 additions & 8 deletions app/components/item-types.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
import Component from '@glimmer/component';

export default Component.extend({
tagName: '',
typeClass: computed('type', function () {
return `js-${this.type}-type`;
}),
});
export default class ItemTypesComponent extends Component {
get typeClass() {
return `js-${this.args.type}-type`;
}
}
14 changes: 9 additions & 5 deletions app/controllers/container-types/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { action } from '@ember/object';
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';

export default class ContainerTypesIndexController extends Controller {
@service port;

export default Controller.extend({
sendContainerToConsole: action(function () {
@action
sendContainerToConsole() {
this.port.send('objectInspector:sendContainerToConsole');
}),
});
}
}
6 changes: 3 additions & 3 deletions app/controllers/info.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Controller from '@ember/controller';

export default Controller.extend({
navWidth: 180,
});
export default class InfoController extends Controller {
navWidth = 180;
}
9 changes: 5 additions & 4 deletions app/controllers/libraries.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { computed } from '@ember/object';
import Controller from '@ember/controller';

export default Controller.extend({
rows: computed('model.[]', function () {
export default class LibrariesController extends Controller {
@computed('model.[]')
get rows() {
return this.get('model.[]').map(({ name, version }) => ({
library: name,
version,
}));
}),
});
}
}
2 changes: 1 addition & 1 deletion app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@width={{this.navWidth}}
>
<div class="split__panel__hd">
{{app-picker}}
<AppPicker/>
</div>
<div class="split__panel__bd">
<SideNav @deprecationCount={{this.deprecationCount}} />
Expand Down
2 changes: 1 addition & 1 deletion ember_debug/object-inspector.js
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ function getClassName(object) {
(emberNames.get(object.constructor) || object.constructor.name)) ||
'';

if ('toString' in object && object.toString !== Function.prototype.toString) {
if ('toString' in object && object.toString !== Object.prototype.toString) {
name = object.toString();
}

Expand Down
20 changes: 10 additions & 10 deletions lib/ui/addon/components/disclosure.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { action } from '@ember/object';
import Component from '@ember/component';
import Component from '@glimmer/component';
import { action, set } from '@ember/object';
import { tracked } from '@glimmer/tracking';

export default Component.extend({
tagName: '',
export default class DisclosureComponent extends Component {
@tracked isExpanded = false;

isExpanded: false,

toggle: action(function () {
this.toggleProperty('isExpanded');
}),
});
@action
toggle() {
set(this, 'isExpanded', !this.isExpanded);
}
}
19 changes: 10 additions & 9 deletions lib/ui/addon/components/draggable-column.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import Component from '@glimmer/component';
import { action } from '@ember/object';
import Component from '@ember/component';
import { inject as service } from '@ember/service';
import { tracked } from '@glimmer/tracking';

export default Component.extend({
tagName: '',
minWidth: 60,

export default class DraggableColumnComponent extends Component {
/**
* Injected `layout` service. Used to broadcast
* changes the layout of the app.
*
* @property layoutService
* @type {Service}
*/
layoutService: service('layout'),
@service('layout') layoutService;

@tracked minWidth = 60;

/**
* Trigger that the application dimensions have changed due to
Expand All @@ -22,7 +22,8 @@ export default Component.extend({
*
* @method triggerResize
*/
triggerResize: action(function () {
@action
triggerResize() {
this.layoutService.trigger('resize', { source: 'draggable-column' });
}),
});
}
}
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
"@glimmer/tracking": "^1.0.0",
"@html-next/vertical-collection": "^1.0.0",
"amd-name-resolver": "^1.3.1",
"aws-sdk": "^2.678.0",
"aws-sdk": "^2.691.0",
"babel-eslint": "^10.1.0",
"babel-plugin-module-resolver": "^4.0.0",
"babel-plugin-transform-es2015-modules-amd": "^6.24.0",
"basiccontext": "^3.5.1",
"broccoli-asset-rev": "^3.0.0",
"broccoli-babel-transpiler": "^7.3.0",
"broccoli-concat": "^3.7.5",
"broccoli-concat": "^4.2.4",
"broccoli-file-creator": "^2.1.1",
"broccoli-funnel": "^3.0.3",
"broccoli-merge-trees": "^4.2.0",
Expand All @@ -60,14 +60,14 @@
"ember-auto-import": "^1.5.3",
"ember-cli": "~3.18.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^7.19.0",
"ember-cli-babel": "^7.20.4",
"ember-cli-code-coverage": "^1.0.0-beta.9",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^4.3.1",
"ember-cli-htmlbars": "^5.1.2",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sass": "^10.0.0",
"ember-cli-shims": "^1.2.0",
"ember-cli-showdown": "^4.4.4",
"ember-cli-showdown": "^4.5.0",
"ember-cli-stylelint": "^4.0.0",
"ember-cli-uglify": "^3.0.0",
"ember-cli-version-checker": "^3.1.3",
Expand All @@ -80,33 +80,33 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.0",
"ember-source": "~3.18.0",
"ember-source": "~3.19.0",
"ember-source-channel-url": "^2.0.1",
"ember-svg-jar": "^2.2.3",
"ember-table": "^2.2.3",
"ember-template-lint": "^2.6.0",
"ember-test-selectors": "^4.0.0",
"ember-template-lint": "^2.8.0",
"ember-test-selectors": "^4.1.0",
"ember-truth-helpers": "^2.1.0",
"ember-try": "^1.1.0",
"ensure-posix-path": "^1.1.1",
"eslint": "^7.0.0",
"eslint": "^7.2.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-ember": "^7.13.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.3",
"fstream": "^1.0.12",
"got": "^11.1.4",
"got": "^11.3.0",
"gulp": "^4.0.2",
"gulp-zip": "^5.0.1",
"loader.js": "^4.7.0",
"normalize.css": "8.0.1",
"npm-run-all": "^4.1.5",
"pretender": "^3.4.1",
"pretender": "^3.4.3",
"prettier": "^2.0.5",
"qunit-dom": "^1.2.0",
"rimraf": "^3.0.0",
"sass": "^1.26.5",
"stylelint": "^13.3.3",
"sass": "^1.26.8",
"stylelint": "^13.6.0",
"stylelint-config-ship-shape": "^0.6.0",
"yauzl": "^2.10.0"
},
Expand Down
Loading

0 comments on commit df63bf2

Please sign in to comment.