@sapui5/sap.ui.vk 1.96.0 → 1.97.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/package.json +1 -1
- package/src/sap/ui/vk/.library +1 -1
- package/src/sap/ui/vk/AnimationPlayback.js +1 -1
- package/src/sap/ui/vk/AnimationPlayer.js +2 -2
- package/src/sap/ui/vk/AnimationSequence.js +1 -1
- package/src/sap/ui/vk/AnimationTimeSlider.js +1 -1
- package/src/sap/ui/vk/AnimationTrack.js +1 -1
- package/src/sap/ui/vk/Annotation.js +1 -1
- package/src/sap/ui/vk/BaseNodeProxy.js +1 -1
- package/src/sap/ui/vk/Camera.js +1 -1
- package/src/sap/ui/vk/ContentConnector.js +1 -1
- package/src/sap/ui/vk/ContentManager.js +1 -1
- package/src/sap/ui/vk/ContentResource.js +7 -5
- package/src/sap/ui/vk/Core.js +1 -1
- package/src/sap/ui/vk/DownloadManager.js +1 -1
- package/src/sap/ui/vk/DrawerToolbar.js +14 -9
- package/src/sap/ui/vk/DvlException.js +1 -1
- package/src/sap/ui/vk/FlexibleControl.js +1 -1
- package/src/sap/ui/vk/FlexibleControlLayoutData.js +1 -1
- package/src/sap/ui/vk/Highlight.js +1 -1
- package/src/sap/ui/vk/ImageContentManager.js +1 -1
- package/src/sap/ui/vk/IncludeUsageIdType.js +17 -0
- package/src/sap/ui/vk/JointUtils.js +1 -1
- package/src/sap/ui/vk/LayerProxy.js +1 -1
- package/src/sap/ui/vk/Loco.js +1 -1
- package/src/sap/ui/vk/Material.js +1 -1
- package/src/sap/ui/vk/NativeViewport.js +11 -18
- package/src/sap/ui/vk/NodeHierarchy.js +1 -1
- package/src/sap/ui/vk/NodeProxy.js +1 -1
- package/src/sap/ui/vk/NodeUtils.js +1 -1
- package/src/sap/ui/vk/Notifications.js +1 -1
- package/src/sap/ui/vk/OrthographicCamera.js +1 -1
- package/src/sap/ui/vk/PerspectiveCamera.js +1 -1
- package/src/sap/ui/vk/ProgressIndicator.js +1 -1
- package/src/sap/ui/vk/RedlineCollaboration.js +12 -15
- package/src/sap/ui/vk/RedlineConversation.js +1 -1
- package/src/sap/ui/vk/RedlineDesign.js +1 -1
- package/src/sap/ui/vk/RedlineElement.js +19 -1
- package/src/sap/ui/vk/RedlineElementComment.js +1 -1
- package/src/sap/ui/vk/RedlineElementEllipse.js +2 -4
- package/src/sap/ui/vk/RedlineElementFreehand.js +2 -4
- package/src/sap/ui/vk/RedlineElementLine.js +2 -4
- package/src/sap/ui/vk/RedlineElementRectangle.js +2 -4
- package/src/sap/ui/vk/RedlineElementText.js +4 -4
- package/src/sap/ui/vk/RedlineSurface.js +1 -1
- package/src/sap/ui/vk/SafeArea.js +1 -1
- package/src/sap/ui/vk/Scene.js +1 -1
- package/src/sap/ui/vk/SceneTree.js +1 -1
- package/src/sap/ui/vk/StepNavigation.js +1 -1
- package/src/sap/ui/vk/Texture.js +1 -1
- package/src/sap/ui/vk/Toolbar.js +1 -1
- package/src/sap/ui/vk/TransformationMatrix.js +16 -15
- package/src/sap/ui/vk/View.js +8 -1
- package/src/sap/ui/vk/ViewGallery.js +1 -1
- package/src/sap/ui/vk/ViewGalleryThumbnail.js +1 -1
- package/src/sap/ui/vk/ViewGroup.js +1 -1
- package/src/sap/ui/vk/ViewManager.js +6 -4
- package/src/sap/ui/vk/ViewStateManager.js +1 -1
- package/src/sap/ui/vk/ViewStateManagerBase.js +1 -1
- package/src/sap/ui/vk/Viewer.js +1 -1
- package/src/sap/ui/vk/Viewport.js +1 -1
- package/src/sap/ui/vk/ViewportBase.js +1 -1
- package/src/sap/ui/vk/dvl/BaseNodeProxy.js +1 -1
- package/src/sap/ui/vk/dvl/ContentManager.js +1 -1
- package/src/sap/ui/vk/dvl/GraphicsCore.js +1 -1
- package/src/sap/ui/vk/dvl/LayerProxy.js +1 -1
- package/src/sap/ui/vk/dvl/NodeHierarchy.js +1 -1
- package/src/sap/ui/vk/dvl/NodeProxy.js +1 -1
- package/src/sap/ui/vk/dvl/Scene.js +1 -1
- package/src/sap/ui/vk/dvl/ViewStateManager.js +1 -1
- package/src/sap/ui/vk/dvl/Viewport.js +11 -1
- package/src/sap/ui/vk/helpers/WorkerScriptLoader.js +1 -8
- package/src/sap/ui/vk/i18n/messagebundle_hr.properties +2 -2
- package/src/sap/ui/vk/i18n/messagebundle_sk.properties +1 -1
- package/src/sap/ui/vk/i18n/messagebundle_sl.properties +1 -1
- package/src/sap/ui/vk/i18n/messagebundle_th.properties +1 -1
- package/src/sap/ui/vk/library.js +3 -3
- package/src/sap/ui/vk/matai/MataiLoader.js +1 -6
- package/src/sap/ui/vk/svg/BaseNodeProxy.js +1 -1
- package/src/sap/ui/vk/svg/ContentDeliveryService.js +1 -1
- package/src/sap/ui/vk/svg/ContentManager.js +1 -1
- package/src/sap/ui/vk/svg/Element.js +2 -1
- package/src/sap/ui/vk/svg/NodeHierarchy.js +1 -1
- package/src/sap/ui/vk/svg/NodeProxy.js +1 -1
- package/src/sap/ui/vk/svg/OrthographicCamera.js +1 -1
- package/src/sap/ui/vk/svg/Scene.js +1 -1
- package/src/sap/ui/vk/svg/SceneBuilder.js +7 -3
- package/src/sap/ui/vk/svg/ViewStateManager.js +1 -1
- package/src/sap/ui/vk/svg/Viewport.js +32 -1
- package/src/sap/ui/vk/threejs/AnimationHelper.js +1 -1
- package/src/sap/ui/vk/threejs/BaseNodeProxy.js +1 -1
- package/src/sap/ui/vk/threejs/Billboard.js +3 -7
- package/src/sap/ui/vk/threejs/Callout.js +1 -1
- package/src/sap/ui/vk/threejs/ContentDeliveryService.js +1 -1
- package/src/sap/ui/vk/threejs/ContentManager.js +1 -1
- package/src/sap/ui/vk/threejs/DetailView.js +1 -1
- package/src/sap/ui/vk/threejs/HighlightPlayer.js +1 -1
- package/src/sap/ui/vk/threejs/Material.js +1 -1
- package/src/sap/ui/vk/threejs/NodeHierarchy.js +74 -1
- package/src/sap/ui/vk/threejs/NodeProxy.js +15 -8
- package/src/sap/ui/vk/threejs/NodesTransitionHelper.js +1 -1
- package/src/sap/ui/vk/threejs/OrthographicCamera.js +1 -1
- package/src/sap/ui/vk/threejs/PerspectiveCamera.js +1 -1
- package/src/sap/ui/vk/threejs/Scene.js +1 -1
- package/src/sap/ui/vk/threejs/SceneBuilder.js +123 -15
- package/src/sap/ui/vk/threejs/Texture.js +1 -1
- package/src/sap/ui/vk/threejs/ThreeExtensions.js +10 -8
- package/src/sap/ui/vk/threejs/Thrustline.js +1 -1
- package/src/sap/ui/vk/threejs/ViewStateManager.js +1 -1
- package/src/sap/ui/vk/threejs/Viewport.js +18 -3
- package/src/sap/ui/vk/threejs/ViewportGestureHandler.js +15 -1
- package/src/sap/ui/vk/tools/AnchorPointTool.js +1 -1
- package/src/sap/ui/vk/tools/AnchorPointToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/AxisAngleRotationTool.js +1 -1
- package/src/sap/ui/vk/tools/AxisAngleRotationToolGizmo.js +9 -4
- package/src/sap/ui/vk/tools/CreateEllipseTool.js +1 -1
- package/src/sap/ui/vk/tools/CreateEllipseToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/CreateEllipseToolHandler.js +6 -1
- package/src/sap/ui/vk/tools/CreateParametricGizmo.js +1 -1
- package/src/sap/ui/vk/tools/CreatePathTool.js +1 -1
- package/src/sap/ui/vk/tools/CreatePathToolGizmo.js +2 -3
- package/src/sap/ui/vk/tools/CreatePathToolHandler.js +7 -8
- package/src/sap/ui/vk/tools/CreateRectangleTool.js +1 -1
- package/src/sap/ui/vk/tools/CreateRectangleToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/CreateRectangleToolHandler.js +6 -1
- package/src/sap/ui/vk/tools/CreateTextTool.js +1 -1
- package/src/sap/ui/vk/tools/CreateTextToolGizmo.js +5 -6
- package/src/sap/ui/vk/tools/CrossSectionTool.js +1 -1
- package/src/sap/ui/vk/tools/CrossSectionToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/Detector.js +8 -5
- package/src/sap/ui/vk/tools/DuplicateSvgHotspotTool.js +1 -1
- package/src/sap/ui/vk/tools/DuplicateSvgHotspotToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/ExplodeTool.js +115 -44
- package/src/sap/ui/vk/tools/ExplodeToolGizmo.js +7 -1
- package/src/sap/ui/vk/tools/Gizmo.js +1 -1
- package/src/sap/ui/vk/tools/HitTestTool.js +1 -1
- package/src/sap/ui/vk/tools/MoveTool.js +1 -1
- package/src/sap/ui/vk/tools/MoveToolGizmo.js +9 -4
- package/src/sap/ui/vk/tools/PoiManipulationTool.js +4 -2
- package/src/sap/ui/vk/tools/RectSelectTool.js +14 -22
- package/src/sap/ui/vk/tools/RedlineTool.js +16 -2
- package/src/sap/ui/vk/tools/RedlineToolGizmo.js +40 -19
- package/src/sap/ui/vk/tools/RedlineToolHandler.js +67 -135
- package/src/sap/ui/vk/tools/RotateOrbitTool.js +1 -1
- package/src/sap/ui/vk/tools/RotateTool.js +1 -1
- package/src/sap/ui/vk/tools/RotateToolGizmo.js +9 -4
- package/src/sap/ui/vk/tools/RotateTurntableTool.js +1 -1
- package/src/sap/ui/vk/tools/ScaleTool.js +1 -1
- package/src/sap/ui/vk/tools/ScaleToolGizmo.js +31 -43
- package/src/sap/ui/vk/tools/SceneOrientationTool.js +1 -1
- package/src/sap/ui/vk/tools/SceneOrientationToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/Tool.js +1 -1
- package/src/sap/ui/vk/tools/TooltipTool.js +1 -1
- package/src/sap/ui/vk/tools/TooltipToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/TransformSvgElementTool.js +1 -1
- package/src/sap/ui/vk/tools/TransformSvgElementToolGizmo.js +1 -1
- package/src/sap/ui/vk/tools/TransformSvgElementToolHandler.js +1 -1
- package/src/sap/ui/vk/totara/RequestQueue.js +1 -19
- package/src/sap/ui/vk/totara/TotaraLoader.js +14 -114
- package/src/sap/ui/vk/totara/TotaraLoaderWorker.js +14 -22
- package/src/sap/ui/vk/totara/TotaraUtils.js +89 -2
- package/src/sap/ui/vk/thirdparty/ie-polyfills.js +0 -75
package/package.json
CHANGED
package/src/sap/ui/vk/.library
CHANGED
|
@@ -25,7 +25,7 @@ sap.ui.define([
|
|
|
25
25
|
*
|
|
26
26
|
* @private
|
|
27
27
|
* @author SAP SE
|
|
28
|
-
* @version 1.
|
|
28
|
+
* @version 1.97.0
|
|
29
29
|
* @extends sap.ui.base.EventProvider
|
|
30
30
|
* @alias sap.ui.vk.AnimationPlayback
|
|
31
31
|
* @experimental Since 1.67.0 This class is experimental and might be modified or removed in future versions.
|
|
@@ -31,7 +31,7 @@ sap.ui.define([
|
|
|
31
31
|
*
|
|
32
32
|
* @public
|
|
33
33
|
* @author SAP SE
|
|
34
|
-
* @version 1.
|
|
34
|
+
* @version 1.97.0
|
|
35
35
|
* @extends sap.ui.core.Element
|
|
36
36
|
* @alias sap.ui.vk.AnimationPlayer
|
|
37
37
|
* @experimental Since 1.67.0 This class is experimental and might be modified or removed in future versions.
|
|
@@ -127,7 +127,7 @@ sap.ui.define([
|
|
|
127
127
|
};
|
|
128
128
|
|
|
129
129
|
AnimationPlayer.prototype._onViewApplied = function(channel, eventId, event) {
|
|
130
|
-
if (event.source.getId()
|
|
130
|
+
if (event.source == null || event.source.getId() !== this.getViewStateManager()) {
|
|
131
131
|
return;
|
|
132
132
|
}
|
|
133
133
|
|
|
@@ -36,7 +36,7 @@ sap.ui.define([
|
|
|
36
36
|
*
|
|
37
37
|
* @public
|
|
38
38
|
* @author SAP SE
|
|
39
|
-
* @version 1.
|
|
39
|
+
* @version 1.97.0
|
|
40
40
|
* @extends sap.ui.core.Control
|
|
41
41
|
* @alias sap.ui.vk.Annotation
|
|
42
42
|
* @experimental Since 1.76.0 This class is experimental and might be modified or removed in future versions.
|
package/src/sap/ui/vk/Camera.js
CHANGED
|
@@ -25,7 +25,7 @@ sap.ui.define([
|
|
|
25
25
|
* @param {object} [oScope] scope An object for resolving string-based type and formatter references in bindings.
|
|
26
26
|
* @public
|
|
27
27
|
* @author SAP SE
|
|
28
|
-
* @version 1.
|
|
28
|
+
* @version 1.97.0
|
|
29
29
|
* @extends sap.ui.base.ManagedObject
|
|
30
30
|
* @alias sap.ui.vk.ContentResource
|
|
31
31
|
*/
|
|
@@ -166,10 +166,12 @@ sap.ui.define([
|
|
|
166
166
|
|
|
167
167
|
/**
|
|
168
168
|
* Optional parameter to load UsageIds. Valid values:
|
|
169
|
-
*
|
|
170
|
-
*
|
|
171
|
-
*
|
|
172
|
-
* string
|
|
169
|
+
* <ul>
|
|
170
|
+
* <li><code>true</code> - Load all UsageIds. This is potentially very expensive, as there could be many UsageIds defined for the tenant which are not relevant to the current application.
|
|
171
|
+
* <li><code>false</code> - Do not load any UsageIds.
|
|
172
|
+
* <li><code>string</code> - A single non-empty string which defines the name of the requested UsageId.
|
|
173
|
+
* <li><code>string[]</code> - An array of non-empty strings which define the names of requested UsageIds.
|
|
174
|
+
* </ul>
|
|
173
175
|
*/
|
|
174
176
|
includeUsageId: {
|
|
175
177
|
type: "sap.ui.vk.IncludeUsageIdType",
|
package/src/sap/ui/vk/Core.js
CHANGED
|
@@ -37,7 +37,7 @@ sap.ui.define([
|
|
|
37
37
|
* If left undefined, the number of retry attempts will default to 1. Passing in 0 disables any retry attempts.
|
|
38
38
|
* @private
|
|
39
39
|
* @author SAP SE
|
|
40
|
-
* @version 1.
|
|
40
|
+
* @version 1.97.0
|
|
41
41
|
* @extends sap.ui.base.EventProvider
|
|
42
42
|
* @alias sap.ui.vk.DownloadManager
|
|
43
43
|
* @since 1.32.0
|
|
@@ -64,7 +64,7 @@ sap.ui.define([
|
|
|
64
64
|
* @extends sap.ui.core.Control
|
|
65
65
|
*
|
|
66
66
|
* @author SAP
|
|
67
|
-
* @version 1.
|
|
67
|
+
* @version 1.97.0
|
|
68
68
|
*
|
|
69
69
|
* @public
|
|
70
70
|
* @alias sap.ui.vk.DrawerToolbar
|
|
@@ -305,7 +305,7 @@ sap.ui.define([
|
|
|
305
305
|
DrawerToolbar.prototype._getViewport = function() {
|
|
306
306
|
var viewport = core.byId(this.getViewport());
|
|
307
307
|
viewport = viewport instanceof Viewport && viewport.getImplementation() || viewport;
|
|
308
|
-
return viewport && (isViewport3D(viewport) || isSvgViewport(viewport)) ? viewport : null;
|
|
308
|
+
return viewport && (isViewport3D(viewport) || isSvgViewport(viewport) || isNativeViewport(viewport)) ? viewport : null;
|
|
309
309
|
};
|
|
310
310
|
|
|
311
311
|
DrawerToolbar.prototype._getViewStateManager = function() {
|
|
@@ -627,7 +627,9 @@ sap.ui.define([
|
|
|
627
627
|
|
|
628
628
|
var showHideSeparator = new ToolbarSeparator();
|
|
629
629
|
var rectSelectSeparator = new ToolbarSeparator();
|
|
630
|
+
var fitToViewSeparator = new ToolbarSeparator();
|
|
630
631
|
this._itemsShowHideSelect = [show, hide, showHideSeparator, this._rectSelectionButton, rectSelectSeparator];
|
|
632
|
+
this._itemsFitToView = [fitToView, fitToViewSeparator];
|
|
631
633
|
|
|
632
634
|
this._items3D = [
|
|
633
635
|
this._gestureButtons[0],
|
|
@@ -649,7 +651,7 @@ sap.ui.define([
|
|
|
649
651
|
this._gestureButtons[3],
|
|
650
652
|
new ToolbarSeparator(),
|
|
651
653
|
fitToView,
|
|
652
|
-
|
|
654
|
+
fitToViewSeparator,
|
|
653
655
|
this._rectSelectionButton,
|
|
654
656
|
rectSelectSeparator,
|
|
655
657
|
crossSectionButton,
|
|
@@ -749,12 +751,11 @@ sap.ui.define([
|
|
|
749
751
|
setGestureIcon(this.viewport, this._mode);
|
|
750
752
|
var dx = p.x - this._x;
|
|
751
753
|
var dy = p.y - this._y;
|
|
752
|
-
var cameraController = isViewport3D(this.viewport) ? this.viewport._viewportGestureHandler._cameraController : this.viewport;
|
|
753
754
|
switch (this._mode) {
|
|
754
|
-
case 0:
|
|
755
|
-
case 1:
|
|
756
|
-
case 2:
|
|
757
|
-
case 3:
|
|
755
|
+
case 0: this.viewport.rotate(dx, dy, true); break;
|
|
756
|
+
case 1: this.viewport.rotate(dx, dy, false); break;
|
|
757
|
+
case 2: this.viewport.pan(dx, dy); break;
|
|
758
|
+
case 3: this.viewport.zoom(1 + dy * 0.005); break;
|
|
758
759
|
default: break;
|
|
759
760
|
}
|
|
760
761
|
this._x = p.x;
|
|
@@ -828,7 +829,7 @@ sap.ui.define([
|
|
|
828
829
|
var viewport = this._getViewport();
|
|
829
830
|
this.setVisible(!!viewport);
|
|
830
831
|
if (viewport) {
|
|
831
|
-
var is3D = isViewport3D(viewport);
|
|
832
|
+
var is3D = isViewport3D(viewport) && !viewport._redlineHandler;
|
|
832
833
|
var isNative = isNativeViewport(viewport);
|
|
833
834
|
|
|
834
835
|
this._ignoreVisiblityChange = true;
|
|
@@ -837,6 +838,10 @@ sap.ui.define([
|
|
|
837
838
|
item.setVisible(!isNative && this._itemsVisibility.get(item));
|
|
838
839
|
}.bind(this));
|
|
839
840
|
|
|
841
|
+
this._itemsFitToView.forEach(function(item) {
|
|
842
|
+
item.setVisible(!viewport._redlineHandler && this._itemsVisibility.get(item));
|
|
843
|
+
}.bind(this));
|
|
844
|
+
|
|
840
845
|
this._items3D.forEach(function(item) {
|
|
841
846
|
item.setVisible(is3D && this._itemsVisibility.get(item));
|
|
842
847
|
}.bind(this));
|
|
@@ -16,7 +16,7 @@ sap.ui.define(["sap/ui/base/Exception"], function(Exception) {
|
|
|
16
16
|
* @param {string} message The error message.
|
|
17
17
|
* @private
|
|
18
18
|
* @author SAP SE
|
|
19
|
-
* @version 1.
|
|
19
|
+
* @version 1.97.0
|
|
20
20
|
* @extends sap.ui.base.Exception
|
|
21
21
|
* @alias sap.ui.vk.DvlException
|
|
22
22
|
*/
|
|
@@ -25,7 +25,7 @@ sap.ui.define([
|
|
|
25
25
|
* (The CSS value "auto" is used internally to recalculate the size of the content
|
|
26
26
|
* dynamically and is not directly set as style property.)
|
|
27
27
|
* @extends sap.ui.core.LayoutData
|
|
28
|
-
* @version 1.
|
|
28
|
+
* @version 1.97.0
|
|
29
29
|
*
|
|
30
30
|
* @constructor
|
|
31
31
|
* @public
|
|
@@ -25,7 +25,7 @@ sap.ui.define([
|
|
|
25
25
|
* @param {object} [mSettings] Initial settings for the new ImageContentManager object.
|
|
26
26
|
* @public
|
|
27
27
|
* @author SAP SE
|
|
28
|
-
* @version 1.
|
|
28
|
+
* @version 1.97.0
|
|
29
29
|
* @extends sap.ui.vk.ContentManager
|
|
30
30
|
* @alias sap.ui.vk.ImageContentManager
|
|
31
31
|
* @since 1.50.0
|
|
@@ -3,6 +3,23 @@ sap.ui.define([
|
|
|
3
3
|
], function(DataType) {
|
|
4
4
|
"use strict";
|
|
5
5
|
|
|
6
|
+
/**
|
|
7
|
+
* @classdesc
|
|
8
|
+
* This type defines possible valid values for property {@link sap.ui.vk.ContentResource#getIncludeUsageId ContentResource.includeUsageId}.
|
|
9
|
+
*
|
|
10
|
+
* The possible valid values:
|
|
11
|
+
* <ul>
|
|
12
|
+
* <li><code>true</code> - Load all UsageIds. This is potentially very expensive, as there could be many UsageIds defined for the tenant which are not relevant to the current application.
|
|
13
|
+
* <li><code>false</code> - Do not load any UsageIds.
|
|
14
|
+
* <li><code>string</code> - A single non-empty string which defines the name of the requested UsageId.
|
|
15
|
+
* <li><code>string[]</code> - An array of non-empty strings which define the names of requested UsageIds.
|
|
16
|
+
* </ul>
|
|
17
|
+
* @namespace
|
|
18
|
+
* @final
|
|
19
|
+
* @public
|
|
20
|
+
* @alias sap.ui.vk.IncludeUsageIdType
|
|
21
|
+
* @since 1.96.0
|
|
22
|
+
*/
|
|
6
23
|
var IncludeUsageIdType = DataType.createType(
|
|
7
24
|
"sap.ui.vk.IncludeUsageIdType",
|
|
8
25
|
{
|
package/src/sap/ui/vk/Loco.js
CHANGED
|
@@ -21,7 +21,7 @@ sap.ui.define([
|
|
|
21
21
|
*
|
|
22
22
|
* @public
|
|
23
23
|
* @author SAP SE
|
|
24
|
-
* @version 1.
|
|
24
|
+
* @version 1.97.0
|
|
25
25
|
* @extends sap.ui.base.ManagedObject
|
|
26
26
|
* @alias sap.ui.vk.Material
|
|
27
27
|
* @experimental Since 1.60.0 This class is experimental and might be modified or removed in future versions.
|
|
@@ -46,7 +46,7 @@ sap.ui.define([
|
|
|
46
46
|
*
|
|
47
47
|
* @extends sap.ui.vk.ViewportBase
|
|
48
48
|
* @author SAP SE
|
|
49
|
-
* @version 1.
|
|
49
|
+
* @version 1.97.0
|
|
50
50
|
* @constructor
|
|
51
51
|
* @public
|
|
52
52
|
* @alias sap.ui.vk.NativeViewport
|
|
@@ -164,7 +164,7 @@ sap.ui.define([
|
|
|
164
164
|
};
|
|
165
165
|
|
|
166
166
|
NativeViewport.prototype.setShouldRenderFrame = function() {
|
|
167
|
-
this.
|
|
167
|
+
this.invalidate();
|
|
168
168
|
};
|
|
169
169
|
|
|
170
170
|
/**
|
|
@@ -494,6 +494,10 @@ sap.ui.define([
|
|
|
494
494
|
return this;
|
|
495
495
|
}
|
|
496
496
|
|
|
497
|
+
if (this._redlineHandler) {
|
|
498
|
+
this._redlineHandler.pan(dx, dy);
|
|
499
|
+
}
|
|
500
|
+
|
|
497
501
|
this._x += dx;
|
|
498
502
|
this._y += dy;
|
|
499
503
|
this._update();
|
|
@@ -517,22 +521,7 @@ sap.ui.define([
|
|
|
517
521
|
* @public
|
|
518
522
|
*/
|
|
519
523
|
NativeViewport.prototype.rotate = function(dx, dy) {
|
|
520
|
-
|
|
521
|
-
return this;
|
|
522
|
-
}
|
|
523
|
-
|
|
524
|
-
this._x += dx;
|
|
525
|
-
this._y += dy;
|
|
526
|
-
this._update();
|
|
527
|
-
this.fireMove({
|
|
528
|
-
pan: {
|
|
529
|
-
x: dx,
|
|
530
|
-
y: dy
|
|
531
|
-
},
|
|
532
|
-
zoom: 1.0
|
|
533
|
-
});
|
|
534
|
-
|
|
535
|
-
return this;
|
|
524
|
+
return this.pan(dx, dy);
|
|
536
525
|
};
|
|
537
526
|
|
|
538
527
|
NativeViewport.prototype._getZoomInLimit = function() {
|
|
@@ -568,6 +557,10 @@ sap.ui.define([
|
|
|
568
557
|
this._s = Math.min(Math.max(this._s * z, this._getZoomOutLimit()), this._getZoomInLimit());
|
|
569
558
|
z = this._s / oldScale;
|
|
570
559
|
|
|
560
|
+
if (this._redlineHandler) {
|
|
561
|
+
this._redlineHandler.zoom(z);
|
|
562
|
+
}
|
|
563
|
+
|
|
571
564
|
var gxn = this._gx * this._s;
|
|
572
565
|
var gyn = this._gy * this._s;
|
|
573
566
|
var dx = gxo - gxn;
|
|
@@ -33,7 +33,7 @@ sap.ui.define([
|
|
|
33
33
|
* @param {object} [mSettings] Initial settings for the new Notifications control.
|
|
34
34
|
* @public
|
|
35
35
|
* @author SAP SE
|
|
36
|
-
* @version 1.
|
|
36
|
+
* @version 1.97.0
|
|
37
37
|
* @extends sap.ui.core.Control
|
|
38
38
|
* @alias sap.ui.vk.Notifications
|
|
39
39
|
* @since 1.38.0
|
|
@@ -30,7 +30,7 @@ sap.ui.define([
|
|
|
30
30
|
*
|
|
31
31
|
* @public
|
|
32
32
|
* @author SAP SE
|
|
33
|
-
* @version 1.
|
|
33
|
+
* @version 1.97.0s
|
|
34
34
|
* @extends sap.ui.core.Element
|
|
35
35
|
* @alias sap.ui.vk.RedlineCollaboration
|
|
36
36
|
* @since 1.89.0
|
|
@@ -261,8 +261,12 @@ sap.ui.define([
|
|
|
261
261
|
vkCore.getEventBus().subscribe("sap.ui.vk", "readyForAnimation", this._readyForAnimation, this);
|
|
262
262
|
var vsm = core.byId(viewport.getViewStateManager());
|
|
263
263
|
var vm = core.byId(vsm.getViewManager());
|
|
264
|
-
vm.
|
|
265
|
-
|
|
264
|
+
vm.setAllowAutoPlayAnimation(false);
|
|
265
|
+
this._activatingView = true;
|
|
266
|
+
if (this._tool.getActive()) {
|
|
267
|
+
this._tool.setActive(false, viewport); // RedlineTool must be deactivated before activateView
|
|
268
|
+
}
|
|
269
|
+
vm.activateView(view, true);
|
|
266
270
|
}
|
|
267
271
|
if (!this._tool.getActive()) {
|
|
268
272
|
this._tool.setActive(true, viewport);
|
|
@@ -297,10 +301,11 @@ sap.ui.define([
|
|
|
297
301
|
}
|
|
298
302
|
viewport.setViewInfo(viewInfo);
|
|
299
303
|
}
|
|
304
|
+
this._activatingView = false;
|
|
300
305
|
vkCore.getEventBus().unsubscribe("sap.ui.vk", "readyForAnimation", this._readyForAnimation, this);
|
|
301
306
|
var vsm = core.byId(viewport.getViewStateManager());
|
|
302
307
|
var vm = core.byId(vsm.getViewManager());
|
|
303
|
-
vm.
|
|
308
|
+
vm.setAllowAutoPlayAnimation(true);
|
|
304
309
|
};
|
|
305
310
|
|
|
306
311
|
/**
|
|
@@ -406,11 +411,7 @@ sap.ui.define([
|
|
|
406
411
|
}
|
|
407
412
|
}
|
|
408
413
|
|
|
409
|
-
|
|
410
|
-
if (conversation) {
|
|
411
|
-
this._tool.destroyRedlineElements();
|
|
412
|
-
conversation._activate(this._tool);
|
|
413
|
-
}
|
|
414
|
+
this._tool.getGizmo().rerender();
|
|
414
415
|
|
|
415
416
|
return this;
|
|
416
417
|
};
|
|
@@ -445,11 +446,7 @@ sap.ui.define([
|
|
|
445
446
|
normalizedArray[i].setHalo(false);
|
|
446
447
|
}
|
|
447
448
|
|
|
448
|
-
|
|
449
|
-
if (conversation) {
|
|
450
|
-
this._tool.destroyRedlineElements();
|
|
451
|
-
conversation._activate(this._tool);
|
|
452
|
-
}
|
|
449
|
+
this._tool.getGizmo().rerender();
|
|
453
450
|
|
|
454
451
|
return this;
|
|
455
452
|
};
|
|
@@ -613,7 +610,7 @@ sap.ui.define([
|
|
|
613
610
|
var activeId = "";
|
|
614
611
|
if (this.getActiveConversation()) {
|
|
615
612
|
var activeConversation = core.byId(this.getActiveConversation());
|
|
616
|
-
if (activeConversation.getViewInfo()) {
|
|
613
|
+
if (!this._activatingView && activeConversation.getViewInfo()) {
|
|
617
614
|
var result = this._updateViewInfo();
|
|
618
615
|
activeConversation.setViewInfo(result);
|
|
619
616
|
}
|
|
@@ -19,7 +19,7 @@ sap.ui.define([
|
|
|
19
19
|
*
|
|
20
20
|
* @public
|
|
21
21
|
* @author SAP SE
|
|
22
|
-
* @version 1.
|
|
22
|
+
* @version 1.97.0
|
|
23
23
|
* @extends sap.ui.core.Element
|
|
24
24
|
* @alias sap.ui.vk.RedlineElement
|
|
25
25
|
* @since 1.40.0
|
|
@@ -132,6 +132,24 @@ sap.ui.define([
|
|
|
132
132
|
return rgba;
|
|
133
133
|
};
|
|
134
134
|
|
|
135
|
+
RedlineElement.prototype._getHaloFilter = function(color) {
|
|
136
|
+
var rgba = this._colorToArray(this.getHaloColor());
|
|
137
|
+
var colorId = rgba.join("");
|
|
138
|
+
return "url(#halo" + colorId + ")";
|
|
139
|
+
};
|
|
140
|
+
|
|
141
|
+
RedlineElement.prototype.setHalo = function(halo) {
|
|
142
|
+
this.setProperty("halo", halo, true);
|
|
143
|
+
var domRef = this.getDomRef();
|
|
144
|
+
if (domRef) {
|
|
145
|
+
if (halo) {
|
|
146
|
+
domRef.setAttribute("filter", this._getHaloFilter());
|
|
147
|
+
} else {
|
|
148
|
+
domRef.removeAttribute("filter");
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
};
|
|
152
|
+
|
|
135
153
|
/**
|
|
136
154
|
* Exports all the relevant data contained in the redline element to a JSON-like object.
|
|
137
155
|
* @returns {object} JSON Relevant data that can be serialized and later used to restore the redline element.
|
|
@@ -22,7 +22,7 @@ sap.ui.define([
|
|
|
22
22
|
*
|
|
23
23
|
* @public
|
|
24
24
|
* @author SAP SE
|
|
25
|
-
* @version 1.
|
|
25
|
+
* @version 1.97.0
|
|
26
26
|
* @extends sap.ui.vk.RedlineElement
|
|
27
27
|
* @alias sap.ui.vk.RedlineElementEllipse
|
|
28
28
|
* @since 1.40.0
|
|
@@ -139,9 +139,7 @@ sap.ui.define([
|
|
|
139
139
|
}
|
|
140
140
|
renderManager.writeAttribute("opacity", this.getOpacity());
|
|
141
141
|
if (halo) {
|
|
142
|
-
|
|
143
|
-
var colorId = rgba.join("");
|
|
144
|
-
renderManager.writeAttribute("filter", "url(#halo" + colorId + ")");
|
|
142
|
+
renderManager.writeAttribute("filter", this._getHaloFilter());
|
|
145
143
|
}
|
|
146
144
|
renderManager.write("></ellipse>");
|
|
147
145
|
|