@realsee/dnalogel 2.15.0-alpha.1 → 2.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs.js +20 -20
- package/dist/index.js +647 -628
- package/dist/index.umd.js +15 -15
- package/docs/classes/CSS3DRender.html +31 -31
- package/docs/classes/CruisePluginController.html +25 -25
- package/docs/classes/Magnifier.html +20 -20
- package/docs/classes/ModelRoomLabelController.html +11 -11
- package/docs/classes/Object3DHelperController.html +24 -24
- package/docs/classes/PaintBrush.html +15 -15
- package/docs/classes/PanoMeasurePluginLine.html +23 -23
- package/docs/classes/PanoMeasurePluginModel.html +22 -22
- package/docs/classes/PanoMeasurePluginPoint.html +14 -14
- package/docs/classes/PanoMeasurePluginPolyline.html +26 -26
- package/docs/classes/PanoTagPluginController.html +46 -46
- package/docs/classes/Util.BetterTween.html +8 -8
- package/docs/classes/Util.FivePointSelector.html +12 -12
- package/docs/classes/Util.Interval.html +12 -12
- package/docs/classes/Util.Magnifier.html +17 -17
- package/docs/classes/Util.PointDomHelper.html +11 -11
- package/docs/classes/Util.PointHelper.html +11 -11
- package/docs/classes/Util.Rectangle.html +13 -13
- package/docs/enums/CameraMovementEffect.html +7 -7
- package/docs/enums/ContentType.html +19 -19
- package/docs/enums/DIRECTION.html +9 -9
- package/docs/enums/DISPLAY_STRATEGY_TYPE.html +9 -9
- package/docs/enums/DimensionType.html +7 -7
- package/docs/enums/FLOOR_PLAN_ATTACHED_TO.html +8 -8
- package/docs/enums/ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE.html +9 -9
- package/docs/enums/PaintBrushTypeEnum.html +8 -8
- package/docs/enums/Rotation.html +8 -8
- package/docs/functions/CSS3DRenderPlugin.html +4 -4
- package/docs/functions/CameraMovementPlugin.html +4 -4
- package/docs/functions/CruisePlugin.html +4 -4
- package/docs/functions/GuideLinePlugin.html +5 -5
- package/docs/functions/ItemLabelPlugin.html +4 -4
- package/docs/functions/MapviewFloorplanPlugin.html +4 -4
- package/docs/functions/ModelChassisCompassPlugin.html +4 -4
- package/docs/functions/ModelEntryDoorGuidePlugin.html +4 -4
- package/docs/functions/ModelFloorplanPlugin.html +4 -4
- package/docs/functions/ModelItemLabelPlugin.html +4 -4
- package/docs/functions/ModelRoomLabelPlugin.html +4 -4
- package/docs/functions/ModelTVVideoPlugin.html +4 -4
- package/docs/functions/ModelViewPlugin.html +4 -4
- package/docs/functions/Object3DHelperPlugin.html +4 -4
- package/docs/functions/PanoCompassPlugin.html +4 -4
- package/docs/functions/PanoCursorRaycasterPlugin.html +4 -4
- package/docs/functions/PanoDoorLabelPlugin.html +4 -4
- package/docs/functions/PanoFloorplanRadarPlugin.html +4 -4
- package/docs/functions/PanoMeasurePlugin.html +4 -4
- package/docs/functions/PanoRulerPlugin.html +4 -4
- package/docs/functions/PanoRulerProPlugin.html +4 -4
- package/docs/functions/PanoSpatialTagPlugin.html +4 -4
- package/docs/functions/PanoTagPlugin.html +4 -4
- package/docs/functions/PanoVideoPlugin.html +4 -4
- package/docs/functions/TopviewFloorplanPlugin.html +4 -4
- package/docs/functions/Util.getCoordsFromClient.html +5 -5
- package/docs/functions/Util.getCoordsFromElement.html +5 -5
- package/docs/functions/Util.getFrameTime.html +5 -5
- package/docs/functions/Util.getIntersectFromRelativePosition.html +5 -5
- package/docs/functions/Util.getRaycasterFromFivePointer.html +5 -5
- package/docs/functions/Util.isNil.html +5 -5
- package/docs/functions/Util.nextFrame.html +5 -5
- package/docs/functions/Util.notNil.html +5 -5
- package/docs/functions/Util.requestAnimationFrameInterval.html +5 -5
- package/docs/functions/Util.tweenProgress.html +5 -5
- package/docs/functions/pluginFlag.html +5 -5
- package/docs/index.html +4 -4
- package/docs/interfaces/AddTagConfig.html +6 -6
- package/docs/interfaces/CSS3DRenderPluginEventMap.html +11 -11
- package/docs/interfaces/CSS3DRenderPluginState.html +8 -8
- package/docs/interfaces/CameraMovementPluginExportType.html +7 -7
- package/docs/interfaces/EventMap.html +15 -15
- package/docs/interfaces/FloorplanBounding.html +8 -8
- package/docs/interfaces/FloorplanData.html +10 -10
- package/docs/interfaces/FloorplanEntrance.html +11 -11
- package/docs/interfaces/FloorplanExtraObject.html +10 -10
- package/docs/interfaces/FloorplanExtraObject3D.html +8 -8
- package/docs/interfaces/FloorplanFloorData.html +9 -9
- package/docs/interfaces/FloorplanImagePosition.html +7 -7
- package/docs/interfaces/FloorplanObserver.html +9 -9
- package/docs/interfaces/FloorplanOutlineItem.html +9 -9
- package/docs/interfaces/FloorplanPosition.html +7 -7
- package/docs/interfaces/FloorplanRoomItem.html +13 -13
- package/docs/interfaces/FloorplanRoomLabelItem.html +7 -7
- package/docs/interfaces/FloorplanServerBounding.html +8 -8
- package/docs/interfaces/FloorplanServerComputedData.html +10 -10
- package/docs/interfaces/FloorplanServerData.html +7 -7
- package/docs/interfaces/FloorplanServerDoorItem.html +10 -10
- package/docs/interfaces/FloorplanServerDoorPosition.html +8 -8
- package/docs/interfaces/FloorplanServerEntrance.html +11 -11
- package/docs/interfaces/FloorplanServerFloorData.html +9 -9
- package/docs/interfaces/FloorplanServerImagePosition.html +7 -7
- package/docs/interfaces/FloorplanServerObserver.html +9 -9
- package/docs/interfaces/FloorplanServerOutlineItem.html +9 -9
- package/docs/interfaces/FloorplanServerPosition.html +7 -7
- package/docs/interfaces/FloorplanServerRoomItem.html +14 -14
- package/docs/interfaces/FloorplanServerRoomLabelItem.html +7 -7
- package/docs/interfaces/HelperOffset.html +8 -8
- package/docs/interfaces/ImagePlaneGroup.html +6 -6
- package/docs/interfaces/ItemLabelPluginData.html +6 -6
- package/docs/interfaces/ItemLabelPluginExportReturnsType.html +11 -11
- package/docs/interfaces/ItemLabelPluginParametersType.html +9 -9
- package/docs/interfaces/MinMax.html +7 -7
- package/docs/interfaces/ModelChassisCompassPluginData.html +7 -7
- package/docs/interfaces/ModelChassisCompassPluginExportType.html +8 -8
- package/docs/interfaces/ModelChassisCompassPluginParameterType.html +7 -7
- package/docs/interfaces/ModelEntryDoorGuidePluginData.html +8 -8
- package/docs/interfaces/ModelEntryDoorGuidePluginExportType.html +8 -8
- package/docs/interfaces/ModelItemLabelPluginData.html +6 -6
- package/docs/interfaces/ModelItemLabelPluginExportReturnsType.html +11 -11
- package/docs/interfaces/ModelItemLabelPluginParametersType.html +7 -7
- package/docs/interfaces/ModelRoomLabelPluginData.html +6 -6
- package/docs/interfaces/ModelTVVideoPluginData.html +9 -9
- package/docs/interfaces/ModelTVVideoPluginExportType.html +8 -8
- package/docs/interfaces/ModelTVVideoPluginParameterType.html +6 -6
- package/docs/interfaces/ModelViewPluginExportType.html +11 -11
- package/docs/interfaces/Object3DHelperState.html +8 -8
- package/docs/interfaces/ObjectHelperControllers.html +9 -9
- package/docs/interfaces/PaintBrushAction.html +12 -12
- package/docs/interfaces/PaintBrushConfigs.html +12 -12
- package/docs/interfaces/PaintBrushState.html +10 -10
- package/docs/interfaces/PanoCursorRaycasterPluginExportType.html +10 -10
- package/docs/interfaces/PanoCursorRaycasterPluginParameterType.html +5 -5
- package/docs/interfaces/PanoMeasureParameterType.html +14 -14
- package/docs/interfaces/PanoMeasurePluginLineJson.html +8 -8
- package/docs/interfaces/PanoMeasurePluginOpenParameter.html +7 -7
- package/docs/interfaces/PanoMeasurePluginPointJson.html +7 -7
- package/docs/interfaces/PanoMeasurePluginPolylineJson.html +8 -8
- package/docs/interfaces/PanoRulerPluginExportType.html +10 -10
- package/docs/interfaces/PanoRulerPluginOptions.html +7 -7
- package/docs/interfaces/PanoRulerPluginParameterType.html +8 -8
- package/docs/interfaces/PanoRulerProPluginExportType.html +9 -9
- package/docs/interfaces/PanoRulerProPluginOptions.html +7 -7
- package/docs/interfaces/PanoRulerProPluginParameterType.html +7 -7
- package/docs/interfaces/PanoRulerProPluginState.html +8 -8
- package/docs/interfaces/PanoSpatialTagPluginContentEvent.html +5 -5
- package/docs/interfaces/PanoSpatialTagPluginContentReplacement.html +5 -5
- package/docs/interfaces/PanoSpatialTagPluginData.html +11 -11
- package/docs/interfaces/PanoSpatialTagPluginDataElement.html +10 -10
- package/docs/interfaces/PanoSpatialTagPluginExportType.html +13 -13
- package/docs/interfaces/PanoSpatialTagPluginOriginElement.html +10 -10
- package/docs/interfaces/PanoSpatialTagPluginParameterType.html +13 -13
- package/docs/interfaces/PanoSpatialTagPluginPointElement.html +11 -11
- package/docs/interfaces/PanoSpatialTagPluginTagElement.html +10 -10
- package/docs/interfaces/PanoVideoPluginType.LoadParams.html +6 -6
- package/docs/interfaces/PanoVideoPluginType.PanoVideoItem.html +8 -8
- package/docs/interfaces/PanoVideoPluginType.PluginData.html +6 -6
- package/docs/interfaces/PanoVideoPluginType.PluginEventMap.html +9 -9
- package/docs/interfaces/PanoVideoPluginType.PluginState.html +6 -6
- package/docs/interfaces/PanoVideoPluginType.VideoItem.html +8 -8
- package/docs/interfaces/PanoVideoPluginType.VideoMeshParams.html +10 -10
- package/docs/interfaces/Point.html +8 -8
- package/docs/interfaces/Room.html +9 -9
- package/docs/interfaces/RoomInfo.html +7 -7
- package/docs/interfaces/RoomLabel.html +14 -14
- package/docs/interfaces/RoomRules.html +5 -5
- package/docs/interfaces/Rooms.html +5 -5
- package/docs/interfaces/Scissor.html +9 -9
- package/docs/interfaces/State.html +8 -8
- package/docs/interfaces/TagCacheInterface.html +12 -12
- package/docs/interfaces/TagConfig.html +11 -11
- package/docs/interfaces/TagGLTFObjectGroup.html +6 -6
- package/docs/interfaces/TagIconUrl.html +11 -11
- package/docs/interfaces/TagObjectGroup.html +6 -6
- package/docs/interfaces/TagStyle.html +6 -6
- package/docs/interfaces/Tags.html +9 -9
- package/docs/interfaces/TemporaryState.html +6 -6
- package/docs/interfaces/Util.MagnifierParameter.html +11 -11
- package/docs/interfaces/Util.MouseGroupParameter.html +8 -8
- package/docs/modules/PanoVideoPluginType.html +5 -5
- package/docs/modules/Util.html +5 -5
- package/docs/modules.html +4 -4
- package/docs/types/ArrayPosition.html +5 -5
- package/docs/types/AudioAppearance.html +5 -5
- package/docs/types/AudioTagTypeConfigKey.html +5 -5
- package/docs/types/CSS3DRenderExportType.html +5 -5
- package/docs/types/CSS3DRenderPluginExportType.html +5 -5
- package/docs/types/CSS3DRenderPluginParameterType.html +5 -5
- package/docs/types/ClassFunctionParameters.html +5 -5
- package/docs/types/Color.html +5 -5
- package/docs/types/ContentTypeConfigKey.html +5 -5
- package/docs/types/ContentTypeConfigKeySplit.html +5 -5
- package/docs/types/ContentTypeMap.html +5 -5
- package/docs/types/Create3DDomContainerReturnType.html +5 -5
- package/docs/types/Create3DElementReturnType.html +5 -5
- package/docs/types/CruisePluginExportType.html +5 -5
- package/docs/types/Direction-1.html +5 -5
- package/docs/types/Direction4.html +5 -5
- package/docs/types/FloorplanRuleLabels.html +5 -5
- package/docs/types/FloorplanServerRuleLabels.html +5 -5
- package/docs/types/GuideLinePluginExportType.html +5 -5
- package/docs/types/HelperEventMap.html +5 -5
- package/docs/types/LoadTagConfig.html +5 -5
- package/docs/types/MapviewFloorplanPluginParameterType.html +5 -5
- package/docs/types/MapviewFloorplanPluginReturnType.html +5 -5
- package/docs/types/MediaData.html +5 -5
- package/docs/types/MediaStore.html +5 -5
- package/docs/types/ModelElement.html +5 -5
- package/docs/types/ModelEntryDoorGuidePluginParameterType.html +5 -5
- package/docs/types/ModelFloorplanPluginParameterType.html +5 -5
- package/docs/types/ModelFloorplanPluginReturnType.html +5 -5
- package/docs/types/ModelRoomLabelPluginParameters.html +5 -5
- package/docs/types/ModelRoomLabelPluginReturnType.html +5 -5
- package/docs/types/MoveArgs.html +5 -5
- package/docs/types/MoveOpts.html +5 -5
- package/docs/types/Object3DHelperEventMap.html +5 -5
- package/docs/types/ObjectFit.html +5 -5
- package/docs/types/PaintBrushEventMap.html +5 -5
- package/docs/types/PanoCompassPluginData.html +5 -5
- package/docs/types/PanoCompassPluginExportType.html +5 -5
- package/docs/types/PanoCompassPluginParameterType.html +5 -5
- package/docs/types/PanoFloorplanRadarPluginParameterType.html +5 -5
- package/docs/types/PanoFloorplanRadarPluginReturnType.html +5 -5
- package/docs/types/PanoIndex.html +5 -5
- package/docs/types/PanoMeasurePluginEvent.html +5 -5
- package/docs/types/PanoMeasureReturnType.html +5 -5
- package/docs/types/PanoSpatialTagPluginId.html +5 -5
- package/docs/types/PanoTagPluginExportInterface.html +5 -5
- package/docs/types/PanoTagPluginParamsInterface.html +5 -5
- package/docs/types/PanoVideoPluginParameterType.html +5 -5
- package/docs/types/PanoVideoPluginReturnType.html +5 -5
- package/docs/types/PlaneTag.html +5 -5
- package/docs/types/PlaneTagElement.html +5 -5
- package/docs/types/Point2DElement.html +5 -5
- package/docs/types/Point2DTag.html +5 -5
- package/docs/types/Point3DElement.html +5 -5
- package/docs/types/Point3DTag.html +5 -5
- package/docs/types/PointTag.html +5 -5
- package/docs/types/PointTagElement.html +5 -5
- package/docs/types/Position.html +5 -5
- package/docs/types/RotateArgs.html +5 -5
- package/docs/types/RotateOpts.html +5 -5
- package/docs/types/RuleLabelsKey.html +5 -5
- package/docs/types/RuleLabelsValue.html +5 -5
- package/docs/types/StickType.html +5 -5
- package/docs/types/Tag.html +5 -5
- package/docs/types/Tag2D.html +5 -5
- package/docs/types/Tag3D.html +5 -5
- package/docs/types/TagContentType.html +5 -5
- package/docs/types/TagDimensionType.html +5 -5
- package/docs/types/TagElement.html +5 -5
- package/docs/types/TagEvents.html +5 -5
- package/docs/types/TagGLTFObject.html +5 -5
- package/docs/types/TagHooks.html +5 -5
- package/docs/types/TagIconSize.html +5 -5
- package/docs/types/TagId.html +5 -5
- package/docs/types/TopviewFloorplanPluginParameterType.html +5 -5
- package/docs/types/TopviewFloorplanPluginReturnType.html +5 -5
- package/docs/types/WorkCode.html +5 -5
- package/docs/variables/FLOOR_TYPE_MAP.html +5 -5
- package/docs/variables/PLUGIN.html +5 -5
- package/docs/variables/ROOM_FETILE_TYPE_MAP.html +5 -5
- package/docs/variables/ROOM_TYPE_MAP.html +5 -5
- package/docs/variables/itemLabelPluginServerParams.html +5 -5
- package/docs/variables/modelItemLabelPluginServerParams.html +5 -5
- package/docs/variables/modelRoomLabelPluginServerParams.html +5 -5
- package/libs/PanoTagPlugin/Components/Common/Media.js +108 -108
- package/libs/PanoTagPlugin/Components/Common/MediaItem.js +118 -100
- package/libs/PanoTagPlugin/controller/TagRender.js +27 -27
- package/libs/PanoTagPlugin/controller/TagUtil.js +1 -1
- package/libs/base/BasePlugin.js +3 -3
- package/libs/index.js +80 -79
- package/package.json +1 -1
|
@@ -1,203 +1,221 @@
|
|
|
1
|
-
import { SvelteComponent as
|
|
2
|
-
import { Image_Play_Icon_With_Text as
|
|
3
|
-
function
|
|
4
|
-
|
|
1
|
+
import { SvelteComponent as q, init as A, safe_not_equal as J, append_styles as R, empty as X, insert as k, noop as B, detach as y, getContext as S, onMount as D, element as g, attr as a, binding_callbacks as G, space as K, set_style as j, toggle_class as v, append as U, listen as I, src_url_equal as P, run_all as Q } from "../../../vendor/svelte/internal/index.js";
|
|
2
|
+
import { Image_Play_Icon_With_Text as Y, Image_Play_Icon as Z } from "../../Assets/Icon.js";
|
|
3
|
+
function x(l) {
|
|
4
|
+
R(l, "svelte-159ski6", ".media-item.svelte-159ski6.svelte-159ski6{position:relative;height:100%}.media-content.svelte-159ski6.svelte-159ski6{position:relative;pointer-events:auto;width:100%;height:100%;-webkit-user-select:none;-moz-user-select:none;user-select:none;-o-object-fit:inherit;object-fit:inherit}.media-content.showPlayButton.svelte-159ski6.svelte-159ski6{pointer-events:none}.video-icon.svelte-159ski6.svelte-159ski6{width:12.5rem;height:6.25rem;max-width:60%;max-height:60%;position:absolute;left:50%;top:50%;transform:translate(-50%, -50%)}.video-play-button-container.svelte-159ski6.svelte-159ski6{display:none;position:absolute;width:100%;height:100%;top:0;left:0;transform:translate3d(0, 0, 0)}.video-play-button-container.showPlayButton.svelte-159ski6.svelte-159ski6{pointer-events:none;display:block}.video-icon.svelte-159ski6.svelte-159ski6{pointer-events:auto}.video-icon.large.svelte-159ski6.svelte-159ski6{width:12.5rem;height:6.25rem}.video-icon.small.svelte-159ski6.svelte-159ski6{width:1.75rem;height:1.75rem}.video-icon.svelte-159ski6 .video-icon-img.svelte-159ski6{width:100%;height:100%;background-position:center center;background-size:contain;background-repeat:no-repeat}.video-icon.svelte-159ski6 .video-icon-img.canPlay.svelte-159ski6{cursor:pointer}");
|
|
5
5
|
}
|
|
6
|
-
function L(
|
|
6
|
+
function L(l) {
|
|
7
7
|
let e;
|
|
8
|
-
function i(
|
|
9
|
-
if (
|
|
10
|
-
return
|
|
11
|
-
if (
|
|
12
|
-
return
|
|
8
|
+
function i(o, r) {
|
|
9
|
+
if (o[2].type === "Image")
|
|
10
|
+
return ee;
|
|
11
|
+
if (o[2].type === "Video")
|
|
12
|
+
return $;
|
|
13
13
|
}
|
|
14
|
-
let t = i(
|
|
14
|
+
let t = i(l), n = t && t(l);
|
|
15
15
|
return {
|
|
16
16
|
c() {
|
|
17
|
-
e = g("div"),
|
|
17
|
+
e = g("div"), n && n.c(), a(e, "class", "media-item svelte-159ski6"), a(e, "draggable", "false");
|
|
18
18
|
},
|
|
19
|
-
m(
|
|
20
|
-
k(
|
|
19
|
+
m(o, r) {
|
|
20
|
+
k(o, e, r), n && n.m(e, null);
|
|
21
21
|
},
|
|
22
|
-
p(
|
|
23
|
-
t === (t = i(
|
|
22
|
+
p(o, r) {
|
|
23
|
+
t === (t = i(o)) && n ? n.p(o, r) : (n && n.d(1), n = t && t(o), n && (n.c(), n.m(e, null)));
|
|
24
24
|
},
|
|
25
|
-
d(
|
|
26
|
-
|
|
25
|
+
d(o) {
|
|
26
|
+
o && y(e), n && n.d();
|
|
27
27
|
}
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
|
-
function
|
|
31
|
-
let e, i, t,
|
|
30
|
+
function $(l) {
|
|
31
|
+
let e, i, t, n, o, r;
|
|
32
32
|
function c(d, m) {
|
|
33
|
-
return d[7] && d[2].videoCoverUrl ?
|
|
33
|
+
return d[7] && d[2].videoCoverUrl ? ie : te;
|
|
34
34
|
}
|
|
35
|
-
let u = c(
|
|
35
|
+
let u = c(l), f = u(l);
|
|
36
36
|
return {
|
|
37
37
|
c() {
|
|
38
|
-
f.c(), e =
|
|
38
|
+
f.c(), e = K(), i = g("div"), t = g("div"), n = g("div"), a(n, "class", "video-icon-img svelte-159ski6"), j(n, "background-image", "url(" + l[20]() + ")"), v(n, "canPlay", l[5]), a(t, "class", "video-icon svelte-159ski6"), v(t, "large", l[4] === "large"), v(t, "small", l[4] === "small"), a(i, "class", "video-play-button-container svelte-159ski6"), v(i, "showPlayButton", l[10]);
|
|
39
39
|
},
|
|
40
40
|
m(d, m) {
|
|
41
|
-
f.m(d, m), k(d, e, m), k(d, i, m), U(i, t), U(t,
|
|
41
|
+
f.m(d, m), k(d, e, m), k(d, i, m), U(i, t), U(t, n), o || (r = I(n, "click", l[21]), o = !0);
|
|
42
42
|
},
|
|
43
43
|
p(d, m) {
|
|
44
|
-
u === (u = c(d)) && f ? f.p(d, m) : (f.d(1), f = u(d), f && (f.c(), f.m(e.parentNode, e))), m & 8 && j(
|
|
44
|
+
u === (u = c(d)) && f ? f.p(d, m) : (f.d(1), f = u(d), f && (f.c(), f.m(e.parentNode, e))), m & 8 && j(n, "background-image", "url(" + d[20]() + ")"), m & 32 && v(n, "canPlay", d[5]), m & 16 && v(t, "large", d[4] === "large"), m & 16 && v(t, "small", d[4] === "small"), m & 1024 && v(i, "showPlayButton", d[10]);
|
|
45
45
|
},
|
|
46
46
|
d(d) {
|
|
47
|
-
f.d(d), d && y(e), d && y(i),
|
|
47
|
+
f.d(d), d && y(e), d && y(i), o = !1, r();
|
|
48
48
|
}
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
|
-
function
|
|
52
|
-
let e, i, t,
|
|
51
|
+
function ee(l) {
|
|
52
|
+
let e, i, t, n;
|
|
53
53
|
return {
|
|
54
54
|
c() {
|
|
55
|
-
e = g("img"),
|
|
55
|
+
e = g("img"), a(e, "class", "media-content svelte-159ski6"), a(e, "style", i = `object-fit: ${l[6]};`), P(e.src, t = l[2].url) || a(e, "src", t), a(e, "alt", n = l[2].name), a(e, "draggable", !1);
|
|
56
56
|
},
|
|
57
|
-
m(
|
|
58
|
-
k(
|
|
57
|
+
m(o, r) {
|
|
58
|
+
k(o, e, r);
|
|
59
59
|
},
|
|
60
|
-
p(
|
|
61
|
-
r & 64 && i !== (i = `object-fit: ${
|
|
60
|
+
p(o, r) {
|
|
61
|
+
r & 64 && i !== (i = `object-fit: ${o[6]};`) && a(e, "style", i), r & 4 && !P(e.src, t = o[2].url) && a(e, "src", t), r & 4 && n !== (n = o[2].name) && a(e, "alt", n);
|
|
62
62
|
},
|
|
63
|
-
d(
|
|
64
|
-
|
|
63
|
+
d(o) {
|
|
64
|
+
o && y(e);
|
|
65
65
|
}
|
|
66
66
|
};
|
|
67
67
|
}
|
|
68
|
-
function
|
|
69
|
-
let e, i, t,
|
|
68
|
+
function te(l) {
|
|
69
|
+
let e, i, t, n, o, r, c;
|
|
70
70
|
return {
|
|
71
71
|
c() {
|
|
72
|
-
e = g("video"),
|
|
72
|
+
e = g("video"), a(e, "class", "media-content svelte-159ski6"), a(e, "style", i = `object-fit: ${l[6]};`), P(e.src, t = l[2].videoCoverUrl ? l[2].url : l[2].url + "#t=0.1") || a(e, "src", t), a(e, "poster", n = l[2].videoCoverUrl), a(e, "preload", o = l[2].videoCoverUrl ? "none" : "auto"), a(e, "disablepictureinpicture", ""), e.playsInline = !0, a(e, "paused", ""), e.muted = !0, a(e, "draggable", !1), e.loop = !1, a(e, "crossorigin", ""), e.controls = !1, v(e, "showPlayButton", l[10]);
|
|
73
73
|
},
|
|
74
74
|
m(u, f) {
|
|
75
|
-
k(u, e, f),
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
75
|
+
k(u, e, f), l[19](e), r || (c = [
|
|
76
|
+
I(e, "play", l[14]),
|
|
77
|
+
I(e, "pause", l[15]),
|
|
78
|
+
I(e, "error", l[16]),
|
|
79
|
+
I(e, "ended", l[17]),
|
|
80
|
+
I(e, "click", l[18])
|
|
79
81
|
], r = !0);
|
|
80
82
|
},
|
|
81
83
|
p(u, f) {
|
|
82
|
-
f & 64 && i !== (i = `object-fit: ${u[6]};`) &&
|
|
84
|
+
f & 64 && i !== (i = `object-fit: ${u[6]};`) && a(e, "style", i), f & 4 && !P(e.src, t = u[2].videoCoverUrl ? u[2].url : u[2].url + "#t=0.1") && a(e, "src", t), f & 4 && n !== (n = u[2].videoCoverUrl) && a(e, "poster", n), f & 4 && o !== (o = u[2].videoCoverUrl ? "none" : "auto") && a(e, "preload", o), f & 1024 && v(e, "showPlayButton", u[10]);
|
|
83
85
|
},
|
|
84
86
|
d(u) {
|
|
85
|
-
u && y(e),
|
|
87
|
+
u && y(e), l[19](null), r = !1, Q(c);
|
|
86
88
|
}
|
|
87
89
|
};
|
|
88
90
|
}
|
|
89
|
-
function
|
|
90
|
-
let e, i, t,
|
|
91
|
+
function ie(l) {
|
|
92
|
+
let e, i, t, n;
|
|
91
93
|
return {
|
|
92
94
|
c() {
|
|
93
|
-
e = g("img"),
|
|
95
|
+
e = g("img"), a(e, "class", "media-content svelte-159ski6"), a(e, "style", i = `object-fit: ${l[6]};`), P(e.src, t = l[2].videoCoverUrl) || a(e, "src", t), a(e, "alt", n = l[2].name), a(e, "draggable", !1);
|
|
94
96
|
},
|
|
95
|
-
m(
|
|
96
|
-
k(
|
|
97
|
+
m(o, r) {
|
|
98
|
+
k(o, e, r);
|
|
97
99
|
},
|
|
98
|
-
p(
|
|
99
|
-
r & 64 && i !== (i = `object-fit: ${
|
|
100
|
+
p(o, r) {
|
|
101
|
+
r & 64 && i !== (i = `object-fit: ${o[6]};`) && a(e, "style", i), r & 4 && !P(e.src, t = o[2].videoCoverUrl) && a(e, "src", t), r & 4 && n !== (n = o[2].name) && a(e, "alt", n);
|
|
100
102
|
},
|
|
101
|
-
d(
|
|
102
|
-
|
|
103
|
+
d(o) {
|
|
104
|
+
o && y(e);
|
|
103
105
|
}
|
|
104
106
|
};
|
|
105
107
|
}
|
|
106
|
-
function
|
|
107
|
-
let e, i =
|
|
108
|
+
function oe(l) {
|
|
109
|
+
let e, i = l[2] && L(l);
|
|
108
110
|
return {
|
|
109
111
|
c() {
|
|
110
|
-
i && i.c(), e =
|
|
112
|
+
i && i.c(), e = X();
|
|
111
113
|
},
|
|
112
|
-
m(t,
|
|
113
|
-
i && i.m(t,
|
|
114
|
+
m(t, n) {
|
|
115
|
+
i && i.m(t, n), k(t, e, n);
|
|
114
116
|
},
|
|
115
|
-
p(t, [
|
|
116
|
-
t[2] ? i ? i.p(t,
|
|
117
|
+
p(t, [n]) {
|
|
118
|
+
t[2] ? i ? i.p(t, n) : (i = L(t), i.c(), i.m(e.parentNode, e)) : i && (i.d(1), i = null);
|
|
117
119
|
},
|
|
118
|
-
i:
|
|
119
|
-
o:
|
|
120
|
+
i: B,
|
|
121
|
+
o: B,
|
|
120
122
|
d(t) {
|
|
121
123
|
i && i.d(t), t && y(e);
|
|
122
124
|
}
|
|
123
125
|
};
|
|
124
126
|
}
|
|
125
|
-
function
|
|
126
|
-
let t,
|
|
127
|
+
function le(l, e, i) {
|
|
128
|
+
let t, n, { mediaInstance: o = { videoInstance: void 0, paused: !0 } } = e, { tag: r } = e, { media: c } = e, { playButtonIfNeed: u = "withoutText" } = e, { playButtonSizeIfNeed: f = "small" } = e, { canPlay: d = !0 } = e, { objectFit: m = "fill" } = e, { disableVideoIfHavePoster: C = !1 } = e, p = !0, b = !1;
|
|
127
129
|
function N() {
|
|
128
|
-
i(
|
|
130
|
+
i(8, b = (c == null ? void 0 : c.type) === "Video" && Boolean(c.videoCoverUrl));
|
|
129
131
|
}
|
|
130
|
-
const w = S("mediaStore"),
|
|
131
|
-
|
|
132
|
+
const w = S("mediaStore"), h = S("hooks"), _ = () => {
|
|
133
|
+
console.debug("loadPoster"), !b && (!t || (i(9, t.muted = !0, t), t.play(), t.pause(), i(9, t.muted = !1, t), i(8, b = !0), console.debug("loadPoster end")));
|
|
132
134
|
};
|
|
133
|
-
|
|
134
|
-
w.subscribe(({ currentMediaElement:
|
|
135
|
-
|
|
135
|
+
h.on("loadVideoFirstFrame", _), D(() => {
|
|
136
|
+
w.subscribe(({ currentMediaElement: s }) => {
|
|
137
|
+
s !== t && (t == null || t.pause());
|
|
136
138
|
});
|
|
137
139
|
});
|
|
138
|
-
const V = (
|
|
139
|
-
i(
|
|
140
|
-
event:
|
|
140
|
+
const V = (s) => {
|
|
141
|
+
i(10, p = !1), i(0, o.paused = !1, o), i(8, b = !0), t && w.set({ currentMediaElement: t }), h.emit("playStateChange", {
|
|
142
|
+
event: s,
|
|
141
143
|
state: "playing",
|
|
142
144
|
tag: r,
|
|
143
145
|
mediaInstance: t
|
|
144
146
|
});
|
|
145
|
-
}, E = (
|
|
146
|
-
i(
|
|
147
|
-
event:
|
|
147
|
+
}, E = (s) => {
|
|
148
|
+
i(10, p = !0), i(0, o.paused = !0, o), h.emit("playStateChange", {
|
|
149
|
+
event: s,
|
|
148
150
|
state: "paused",
|
|
149
151
|
tag: r,
|
|
150
152
|
mediaInstance: t
|
|
151
153
|
});
|
|
152
|
-
}, z = (
|
|
154
|
+
}, z = (s) => {
|
|
155
|
+
i(10, p = !0), i(0, o.paused = !0, o), h.emit("playStateChange", {
|
|
156
|
+
event: s,
|
|
157
|
+
state: "paused",
|
|
158
|
+
tag: r,
|
|
159
|
+
mediaInstance: t
|
|
160
|
+
});
|
|
161
|
+
}, F = (s) => {
|
|
162
|
+
i(10, p = !0), i(0, o.paused = !0, o), h.emit("playStateChange", {
|
|
163
|
+
event: s,
|
|
164
|
+
state: "paused",
|
|
165
|
+
tag: r,
|
|
166
|
+
mediaInstance: t
|
|
167
|
+
});
|
|
168
|
+
}, O = (s) => {
|
|
153
169
|
t && t.pause();
|
|
154
170
|
};
|
|
155
|
-
function
|
|
156
|
-
|
|
157
|
-
|
|
171
|
+
function W(s) {
|
|
172
|
+
G[s ? "unshift" : "push"](() => {
|
|
173
|
+
o.videoInstance = s, i(0, o);
|
|
158
174
|
});
|
|
159
175
|
}
|
|
160
|
-
const
|
|
161
|
-
!d || t && (i(
|
|
176
|
+
const H = () => u === "withText" ? Y : u === "withoutText" ? Z : u, T = (s) => {
|
|
177
|
+
!d || t && (i(9, t.muted = !1, t), t.play());
|
|
162
178
|
};
|
|
163
|
-
return
|
|
164
|
-
"mediaInstance" in
|
|
165
|
-
},
|
|
166
|
-
if (
|
|
167
|
-
const
|
|
168
|
-
t &&
|
|
179
|
+
return l.$$set = (s) => {
|
|
180
|
+
"mediaInstance" in s && i(0, o = s.mediaInstance), "tag" in s && i(1, r = s.tag), "media" in s && i(2, c = s.media), "playButtonIfNeed" in s && i(3, u = s.playButtonIfNeed), "playButtonSizeIfNeed" in s && i(4, f = s.playButtonSizeIfNeed), "canPlay" in s && i(5, d = s.canPlay), "objectFit" in s && i(6, m = s.objectFit), "disableVideoIfHavePoster" in s && i(7, C = s.disableVideoIfHavePoster);
|
|
181
|
+
}, l.$$.update = () => {
|
|
182
|
+
if (l.$$.dirty & 1 && i(9, t = o.videoInstance), l.$$.dirty & 4 && i(13, n = c == null ? void 0 : c.url), l.$$.dirty & 8192 && Boolean(n) && N(), l.$$.dirty & 512 && t && i(10, p = t.paused), l.$$.dirty & 772 && (c == null ? void 0 : c.type) === "Video" && !b) {
|
|
183
|
+
const s = navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1, M = navigator.userAgent.toLowerCase().indexOf("iphone") !== -1 && s;
|
|
184
|
+
t && M && t.paused && (document.removeEventListener("WeixinJSBridgeReady", _), document.removeEventListener("touchstart", _), document.removeEventListener("click", _), document.addEventListener("WeixinJSBridgeReady", _), document.addEventListener("touchstart", _), document.addEventListener("click", _));
|
|
169
185
|
}
|
|
170
186
|
}, [
|
|
171
|
-
|
|
187
|
+
o,
|
|
172
188
|
r,
|
|
173
189
|
c,
|
|
174
190
|
u,
|
|
175
191
|
f,
|
|
176
192
|
d,
|
|
177
193
|
m,
|
|
178
|
-
|
|
194
|
+
C,
|
|
195
|
+
b,
|
|
179
196
|
t,
|
|
180
197
|
p,
|
|
181
198
|
w,
|
|
182
|
-
I,
|
|
183
199
|
h,
|
|
184
|
-
|
|
200
|
+
n,
|
|
185
201
|
V,
|
|
186
202
|
E,
|
|
187
203
|
z,
|
|
188
204
|
F,
|
|
189
205
|
O,
|
|
190
|
-
W
|
|
206
|
+
W,
|
|
207
|
+
H,
|
|
208
|
+
T
|
|
191
209
|
];
|
|
192
210
|
}
|
|
193
|
-
class
|
|
211
|
+
class re extends q {
|
|
194
212
|
constructor(e) {
|
|
195
|
-
super(),
|
|
213
|
+
super(), A(
|
|
196
214
|
this,
|
|
197
215
|
e,
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
216
|
+
le,
|
|
217
|
+
oe,
|
|
218
|
+
J,
|
|
201
219
|
{
|
|
202
220
|
mediaInstance: 0,
|
|
203
221
|
tag: 1,
|
|
@@ -208,10 +226,10 @@ class se extends T {
|
|
|
208
226
|
objectFit: 6,
|
|
209
227
|
disableVideoIfHavePoster: 7
|
|
210
228
|
},
|
|
211
|
-
|
|
229
|
+
x
|
|
212
230
|
);
|
|
213
231
|
}
|
|
214
232
|
}
|
|
215
233
|
export {
|
|
216
|
-
|
|
234
|
+
re as default
|
|
217
235
|
};
|
|
@@ -4,18 +4,18 @@ var d = (l, p, t) => (w(l, typeof p != "symbol" ? p + "" : p, t), t);
|
|
|
4
4
|
var D = (l, p, t) => new Promise((e, i) => {
|
|
5
5
|
var o = (s) => {
|
|
6
6
|
try {
|
|
7
|
-
|
|
7
|
+
a(t.next(s));
|
|
8
8
|
} catch (r) {
|
|
9
9
|
i(r);
|
|
10
10
|
}
|
|
11
|
-
},
|
|
11
|
+
}, n = (s) => {
|
|
12
12
|
try {
|
|
13
|
-
|
|
13
|
+
a(t.throw(s));
|
|
14
14
|
} catch (r) {
|
|
15
15
|
i(r);
|
|
16
16
|
}
|
|
17
|
-
},
|
|
18
|
-
|
|
17
|
+
}, a = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(o, n);
|
|
18
|
+
a((t = t.apply(l, p)).next());
|
|
19
19
|
});
|
|
20
20
|
import { TagComputer as O } from "./TagComputer.js";
|
|
21
21
|
import { Group as P, Quaternion as x, Vector3 as f, Matrix4 as T } from "three";
|
|
@@ -152,8 +152,8 @@ class Le extends O {
|
|
|
152
152
|
if (((s = t.model) == null ? void 0 : s.promise) !== i || (t.model.object = o, !this.tags.includes(t)))
|
|
153
153
|
return;
|
|
154
154
|
o.visible = this.getCurrentVisibleState(t), new T().fromArray(t.matrix).decompose(o.position, o.quaternion, o.scale), o.updateWorldMatrix(!0, !0), o.visible = this.getVisibleByFloorIndex(t);
|
|
155
|
-
const
|
|
156
|
-
if (
|
|
155
|
+
const a = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
|
|
156
|
+
if (a && this.gltfObjectGroup.remove(a), this.getRenderType(t) === "Mesh") {
|
|
157
157
|
if (!t.imagePlane) {
|
|
158
158
|
const r = t.data.mediaPosition.map(b);
|
|
159
159
|
t.imagePlane = new R(t.data.mediaData[0].url, t.data.mediaPosition.map(b));
|
|
@@ -177,9 +177,9 @@ class Le extends O {
|
|
|
177
177
|
}
|
|
178
178
|
updateRenderImagePlane() {
|
|
179
179
|
this.sort(this.filterImagePlane).forEach((e) => {
|
|
180
|
-
var
|
|
181
|
-
const i = (
|
|
182
|
-
if (!i || (e.imagePlane && (e.imagePlane.visible = (s = (
|
|
180
|
+
var n, a, s, r;
|
|
181
|
+
const i = (n = e.data.mediaData[0]) == null ? void 0 : n.url;
|
|
182
|
+
if (!i || (e.imagePlane && (e.imagePlane.visible = (s = (a = e.state) == null ? void 0 : a.visible) != null ? s : !0), ((r = e.imagePlane) == null ? void 0 : r.imageSrc) === i))
|
|
183
183
|
return;
|
|
184
184
|
const o = e.position.map(b);
|
|
185
185
|
e.imagePlane = new R(i, o), e.imagePlane.setMatrixByCornerPoints(o), this.imagePlaneGroup.add(e.imagePlane);
|
|
@@ -189,10 +189,10 @@ class Le extends O {
|
|
|
189
189
|
this.sort([...this.filterCSS3DTag]).forEach((e) => {
|
|
190
190
|
var i, o;
|
|
191
191
|
if (e.tag3DContentSvelte) {
|
|
192
|
-
const { svelteApp:
|
|
193
|
-
if (
|
|
192
|
+
const { svelteApp: n, domContainer: a, initialNormal: s, currentNormal: r } = e.tag3DContentSvelte;
|
|
193
|
+
if (n.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !s.equals(r)) {
|
|
194
194
|
const m = new x().setFromUnitVectors(s, r);
|
|
195
|
-
|
|
195
|
+
a.css3DObject.setRotationFromQuaternion(m);
|
|
196
196
|
}
|
|
197
197
|
return;
|
|
198
198
|
} else {
|
|
@@ -200,12 +200,12 @@ class Le extends O {
|
|
|
200
200
|
return;
|
|
201
201
|
if (this.css3DRenderPlugin || (this.css3DRenderPlugin = E(this.five)), e.stickType === "3DPoint" && !e.normal)
|
|
202
202
|
return console.error("updateRenderPlaneTag: \u4E09\u7EF4\u70B9\u6807\u7B7E\u7F3A\u5C11\u6CD5\u5411\u91CF\uFF01");
|
|
203
|
-
const
|
|
204
|
-
if (!a)
|
|
205
|
-
return;
|
|
206
|
-
const n = this.getTagNormal(e);
|
|
203
|
+
const n = this.getPositions(e);
|
|
207
204
|
if (!n)
|
|
208
205
|
return;
|
|
206
|
+
const a = this.getTagNormal(e);
|
|
207
|
+
if (!a)
|
|
208
|
+
return;
|
|
209
209
|
const r = (o = this.getTagConfig(e).tag3DConfig) != null ? o : {};
|
|
210
210
|
if (this.getRenderType(e) === "BehindDom") {
|
|
211
211
|
r.mode = "behind", r.container = document.createElement("div");
|
|
@@ -214,13 +214,13 @@ class Le extends O {
|
|
|
214
214
|
var u;
|
|
215
215
|
if (m.css3DObject.opacityMesh) {
|
|
216
216
|
const g = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (c) => {
|
|
217
|
-
|
|
217
|
+
this.hooks.emit("click", { event: c, target: "TagContent", tag: e });
|
|
218
218
|
});
|
|
219
219
|
(u = this.store.css3DRenderDisposer.get(e.id)) == null || u.push(g);
|
|
220
220
|
}
|
|
221
221
|
});
|
|
222
222
|
}
|
|
223
|
-
const m = this.css3DRenderPlugin.create3DDomContainer(
|
|
223
|
+
const m = this.css3DRenderPlugin.create3DDomContainer(n, r);
|
|
224
224
|
if (!m)
|
|
225
225
|
return;
|
|
226
226
|
this.store.css3DRenderDisposer.set(e.id, [m.dispose]), e.tag3DContentSvelte = {
|
|
@@ -235,8 +235,8 @@ class Le extends O {
|
|
|
235
235
|
}
|
|
236
236
|
}),
|
|
237
237
|
domContainer: m,
|
|
238
|
-
initialNormal:
|
|
239
|
-
currentNormal:
|
|
238
|
+
initialNormal: a,
|
|
239
|
+
currentNormal: a
|
|
240
240
|
};
|
|
241
241
|
}
|
|
242
242
|
}), this.clearUnusedPanelTag();
|
|
@@ -245,8 +245,8 @@ class Le extends O {
|
|
|
245
245
|
const t = (i) => !this.enabledModelTagSet.has(i.customID);
|
|
246
246
|
this.gltfObjectGroup.remove(...this.gltfObjectGroup.children.filter(t)), this.tags.filter(S).forEach((i) => {
|
|
247
247
|
var o;
|
|
248
|
-
(o = i.model) == null || o.promise.then((
|
|
249
|
-
|
|
248
|
+
(o = i.model) == null || o.promise.then((n) => {
|
|
249
|
+
n.visible = this.getCurrentVisibleState(i);
|
|
250
250
|
});
|
|
251
251
|
});
|
|
252
252
|
}
|
|
@@ -261,9 +261,9 @@ class Le extends O {
|
|
|
261
261
|
const i = (M = (v = (C = t.mergedConfig) == null ? void 0 : C.tag3DConfig) == null ? void 0 : v.ratio) != null ? M : 216e-5, o = (y = t.tag3DContentSvelte) == null ? void 0 : y.domContainer.css3DObject;
|
|
262
262
|
if (!o)
|
|
263
263
|
return;
|
|
264
|
-
const
|
|
264
|
+
const n = S(t) ? t.data.mediaPosition : t.position;
|
|
265
265
|
e.updateWorldMatrix(!1, !1);
|
|
266
|
-
const
|
|
266
|
+
const a = e.matrixWorld, s = new f().fromArray(n[0]), r = new f().fromArray(n[2]), m = A(s, r).add(new f(0, 0, 5e-4)), h = new T().setPosition(m), u = new T().makeScale(i, i, i), g = new T().multiply(a).multiply(h).multiply(u);
|
|
267
267
|
g.decompose(o.position, o.quaternion, o.scale);
|
|
268
268
|
const c = o.opacityMesh;
|
|
269
269
|
c && g.decompose(c.position, c.quaternion, c.scale);
|
|
@@ -296,8 +296,8 @@ class Le extends O {
|
|
|
296
296
|
temporaryState: this.temporaryState,
|
|
297
297
|
withAnimation: this.store.visibleWithAnimation
|
|
298
298
|
}), this.filterCSS3DTag.forEach((e) => {
|
|
299
|
-
var i, o,
|
|
300
|
-
(
|
|
299
|
+
var i, o, n, a, s;
|
|
300
|
+
(a = (o = (i = e.tag3DContentSvelte) == null ? void 0 : i.domContainer) == null ? void 0 : o.css3DObject) == null || a.setVisible((this.state.visible && ((n = e.state) == null ? void 0 : n.visible)) !== !1), (s = e.tag3DContentSvelte) == null || s.svelteApp.$set({
|
|
301
301
|
state: this.state,
|
|
302
302
|
temporaryState: this.temporaryState,
|
|
303
303
|
withAnimation: this.store.visibleWithAnimation
|
package/libs/base/BasePlugin.js
CHANGED
|
@@ -2,9 +2,9 @@ var i = Object.defineProperty;
|
|
|
2
2
|
var a = (e, r, t) => r in e ? i(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t;
|
|
3
3
|
var s = (e, r, t) => (a(e, typeof r != "symbol" ? r + "" : r, t), t);
|
|
4
4
|
import { Subscribe as c } from "../shared-utils/Subscribe.js";
|
|
5
|
-
class
|
|
5
|
+
class x {
|
|
6
6
|
constructor(r, t) {
|
|
7
|
-
s(this, "VERSION", "2.15.0
|
|
7
|
+
s(this, "VERSION", "2.15.0");
|
|
8
8
|
s(this, "five");
|
|
9
9
|
s(this, "hooks", new c());
|
|
10
10
|
s(this, "staticPrefix", "//vrlab-static.ljcdn.com");
|
|
@@ -15,5 +15,5 @@ class o {
|
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
export {
|
|
18
|
-
|
|
18
|
+
x as Controller
|
|
19
19
|
};
|