From 842b989e197cae608422557ccf422513b4588162 Mon Sep 17 00:00:00 2001 From: Luciano Iam Date: Sun, 14 Jun 2020 12:10:30 +0200 Subject: [PATCH] WS: improve ES6 import/export syntax --- share/web_surfaces/builtin/mixer-demo/js/main.js | 2 +- share/web_surfaces/builtin/transport/main.js | 2 +- share/web_surfaces/index/main.js | 2 +- share/web_surfaces/shared/ardour.js | 8 ++++---- share/web_surfaces/shared/base/channel.js | 2 +- share/web_surfaces/shared/base/component.js | 2 +- share/web_surfaces/shared/base/observable.js | 2 +- share/web_surfaces/shared/components/mixer.js | 4 ++-- share/web_surfaces/shared/components/parameter.js | 2 +- share/web_surfaces/shared/components/plugin.js | 4 ++-- share/web_surfaces/shared/components/strip.js | 4 ++-- share/web_surfaces/shared/components/transport.js | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/share/web_surfaces/builtin/mixer-demo/js/main.js b/share/web_surfaces/builtin/mixer-demo/js/main.js index f269857310..b3e943495d 100644 --- a/share/web_surfaces/builtin/mixer-demo/js/main.js +++ b/share/web_surfaces/builtin/mixer-demo/js/main.js @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import { ArdourClient } from '/shared/ardour.js'; +import ArdourClient from '/shared/ardour.js'; import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider, StripPanSlider, StripGainSlider, StripMeter } from './widget.js'; diff --git a/share/web_surfaces/builtin/transport/main.js b/share/web_surfaces/builtin/transport/main.js index 756d8a5a39..83378b0ccd 100644 --- a/share/web_surfaces/builtin/transport/main.js +++ b/share/web_surfaces/builtin/transport/main.js @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import { ArdourClient } from '/shared/ardour.js'; +import ArdourClient from '/shared/ardour.js'; (() => { diff --git a/share/web_surfaces/index/main.js b/share/web_surfaces/index/main.js index be2ef70d02..2796ee1b71 100644 --- a/share/web_surfaces/index/main.js +++ b/share/web_surfaces/index/main.js @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import { ArdourClient } from '/shared/ardour.js'; +import ArdourClient from '/shared/ardour.js'; (() => { diff --git a/share/web_surfaces/shared/ardour.js b/share/web_surfaces/shared/ardour.js index c3e57c2b78..5ba980e0f1 100644 --- a/share/web_surfaces/shared/ardour.js +++ b/share/web_surfaces/shared/ardour.js @@ -16,12 +16,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import { MessageChannel } from './base/channel.js'; import { StateNode } from './base/protocol.js'; -import { Mixer } from './components/mixer.js'; -import { Transport } from './components/transport.js'; +import MessageChannel from './base/channel.js'; +import Mixer from './components/mixer.js'; +import Transport from './components/transport.js'; -export class ArdourClient { +export default class ArdourClient { constructor (handlers, options) { this._options = options || {}; diff --git a/share/web_surfaces/shared/base/channel.js b/share/web_surfaces/shared/base/channel.js index df95786a43..26f3f5534e 100644 --- a/share/web_surfaces/shared/base/channel.js +++ b/share/web_surfaces/shared/base/channel.js @@ -18,7 +18,7 @@ import { Message } from './protocol.js'; -export class MessageChannel { +export default class MessageChannel { constructor (host) { // https://developer.mozilla.org/en-US/docs/Web/API/URL/host diff --git a/share/web_surfaces/shared/base/component.js b/share/web_surfaces/shared/base/component.js index 643991a500..6e228caf46 100644 --- a/share/web_surfaces/shared/base/component.js +++ b/share/web_surfaces/shared/base/component.js @@ -17,7 +17,7 @@ */ import { Message } from './protocol.js'; -import { Observable } from './observable.js'; +import Observable from './observable.js'; export class Component extends Observable { diff --git a/share/web_surfaces/shared/base/observable.js b/share/web_surfaces/shared/base/observable.js index bd2779018f..1c1849e5a8 100644 --- a/share/web_surfaces/shared/base/observable.js +++ b/share/web_surfaces/shared/base/observable.js @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -export class Observable { +export default class Observable { constructor () { this._observers = {}; diff --git a/share/web_surfaces/shared/components/mixer.js b/share/web_surfaces/shared/components/mixer.js index 33d94bf75c..55bd4b2d5e 100644 --- a/share/web_surfaces/shared/components/mixer.js +++ b/share/web_surfaces/shared/components/mixer.js @@ -18,9 +18,9 @@ import { Component } from '../base/component.js'; import { StateNode } from '../base/protocol.js'; -import { Strip } from './strip.js'; +import Strip from './strip.js'; -export class Mixer extends Component { +export default class Mixer extends Component { constructor (channel) { super(channel); diff --git a/share/web_surfaces/shared/components/parameter.js b/share/web_surfaces/shared/components/parameter.js index 9053804a63..dcb98260b3 100644 --- a/share/web_surfaces/shared/components/parameter.js +++ b/share/web_surfaces/shared/components/parameter.js @@ -39,7 +39,7 @@ class ValueType { } -export class Parameter extends AddressableComponent { +export default class Parameter extends AddressableComponent { constructor (parent, addr, desc) { super(parent, addr); diff --git a/share/web_surfaces/shared/components/plugin.js b/share/web_surfaces/shared/components/plugin.js index 6e2d7f2ad7..4240293d9b 100644 --- a/share/web_surfaces/shared/components/plugin.js +++ b/share/web_surfaces/shared/components/plugin.js @@ -17,10 +17,10 @@ */ import { AddressableComponent } from '../base/component.js'; -import { Parameter } from './parameter.js'; import { StateNode } from '../base/protocol.js'; +import Parameter from './parameter.js'; -export class Plugin extends AddressableComponent { +export default class Plugin extends AddressableComponent { constructor (parent, addr, desc) { super(parent, addr); diff --git a/share/web_surfaces/shared/components/strip.js b/share/web_surfaces/shared/components/strip.js index dee3ea6f19..c27076ff1e 100644 --- a/share/web_surfaces/shared/components/strip.js +++ b/share/web_surfaces/shared/components/strip.js @@ -17,8 +17,8 @@ */ import { AddressableComponent } from '../base/component.js'; -import { Plugin } from './plugin.js'; import { StateNode } from '../base/protocol.js'; +import Plugin from './plugin.js'; const NodeToProperty = Object.freeze({ [StateNode.STRIP_METER] : 'meter', @@ -27,7 +27,7 @@ const NodeToProperty = Object.freeze({ [StateNode.STRIP_MUTE] : 'mute' }); -export class Strip extends AddressableComponent { +export default class Strip extends AddressableComponent { constructor (parent, addr, desc) { super(parent, addr); diff --git a/share/web_surfaces/shared/components/transport.js b/share/web_surfaces/shared/components/transport.js index 47f19eea93..bc0e177103 100644 --- a/share/web_surfaces/shared/components/transport.js +++ b/share/web_surfaces/shared/components/transport.js @@ -26,7 +26,7 @@ const NodeToProperty = Object.freeze({ [StateNode.TRANSPORT_RECORD] : 'record' }); -export class Transport extends Component { +export default class Transport extends Component { constructor (channel) { super(channel);