Browse Source

Add default device option. Closes #3679

pull/3725/head
Artur Arseniev 5 years ago
parent
commit
11610f078f
  1. 15
      src/canvas/model/Canvas.js
  2. 4
      src/device_manager/config/config.js
  3. 3
      src/device_manager/index.js

15
src/canvas/model/Canvas.js

@ -28,13 +28,10 @@ export default class Canvas extends Model {
init() { init() {
const { em } = this; const { em } = this;
this.set( const mainPage = em.get('PageManager').getMain();
'frames', const frame = mainPage.getMainFrame();
em this.set('frames', mainPage.getFrames());
.get('PageManager') this.updateDevice({ frame });
.getMain()
.getFrames()
);
} }
_pageUpdated(page, prev) { _pageUpdated(page, prev) {
@ -45,10 +42,10 @@ export default class Canvas extends Model {
this.set('frames', page.getFrames()); this.set('frames', page.getFrames());
} }
updateDevice() { updateDevice(opts = {}) {
const { em } = this; const { em } = this;
const device = em.getDeviceModel(); const device = em.getDeviceModel();
const model = em.getCurrentFrameModel(); const model = opts.frame || em.getCurrentFrameModel();
if (model && device) { if (model && device) {
const { width, height } = device.attributes; const { width, height } = device.attributes;

4
src/device_manager/config/config.js

@ -1,4 +1,8 @@
export default { export default {
// The device `id` to select on start, if not indicated, the first available from `devices` will be used.
default: null,
// Default devices
devices: [ devices: [
{ {
id: 'desktop', id: 'desktop',

3
src/device_manager/index.js

@ -80,9 +80,10 @@ export default () => {
const { em } = c; const { em } = c;
devices = new Devices(); devices = new Devices();
(c.devices || []).forEach(dv => this.add(dv.id || dv.name, dv.width, dv)); c.devices.forEach(dv => this.add(dv));
this.em = em; this.em = em;
this.all = devices; this.all = devices;
this.select(c.default || devices.at(0));
this.__initListen(); this.__initListen();
em.on(chnSel, this._onSelect, this); em.on(chnSel, this._onSelect, this);

Loading…
Cancel
Save