diff --git a/bootstrap/src/uri/dsm-uri.ts b/bootstrap/src/uri/dsm-uri.ts index 66c480131..7f12700d4 100644 --- a/bootstrap/src/uri/dsm-uri.ts +++ b/bootstrap/src/uri/dsm-uri.ts @@ -29,7 +29,7 @@ export class DsmUri implements ZLUX.UriBroker { _sourceEncodingOrOptions?: string|ZLUX.UnixFileUriOptions, _targetEncoding?: string, _newName?: string, _forceOverwrite?: boolean, _sessionID?: number, _lastChunk?: boolean, _responseType?: string, _mode?: string, _recursive?: boolean, - _user?: string, _group?: string): string { + _user?: string, _group?: string, _type?: ZLUX.TagType, _codeset?: number): string { return ""; } omvsSegmentUri(): string { diff --git a/bootstrap/src/uri/mvd-uri.ts b/bootstrap/src/uri/mvd-uri.ts index 0c59868fd..0e5ef7d4f 100644 --- a/bootstrap/src/uri/mvd-uri.ts +++ b/bootstrap/src/uri/mvd-uri.ts @@ -23,7 +23,7 @@ export class MvdUri implements ZLUX.UriBroker { sourceEncodingOrOptions?: string|ZLUX.UnixFileUriOptions, targetEncoding?: string, newName?: string, forceOverwrite?: boolean, sessionID?: number, lastChunk?: boolean, responseType?: string, mode?: string, recursive?: boolean, - user?: string, group?: string): string { + user?: string, group?: string, type?: ZLUX.TagType, codeset?: number): string { let options; if (typeof sourceEncodingOrOptions == 'object') { options = sourceEncodingOrOptions; @@ -38,7 +38,10 @@ export class MvdUri implements ZLUX.UriBroker { mode, recursive, user, - group }; + group, + type, + codeset, + }; } if (!options.responseType) { options.responseType = 'raw'; diff --git a/bootstrap/web/iframe-adapter.js b/bootstrap/web/iframe-adapter.js index 96902914e..b72c4db81 100644 --- a/bootstrap/web/iframe-adapter.js +++ b/bootstrap/web/iframe-adapter.js @@ -250,7 +250,7 @@ var ZoweZLUX = { return translateFunction('ZoweZLUX.uriBroker.VSAMdatasetContentsUri', Array.prototype.slice.call(arguments)) }, unixFileUri(route, absPath, sourceEncodingOrOptions, targetEncoding, newName, forceOverwrite, sessionID, - lastChunk, responseType, mode, recursive, user, group){ + lastChunk, responseType, mode, recursive, user, group, type, codeset){ return translateFunction('ZoweZLUX.uriBroker.unixFileUri', Array.prototype.slice.call(arguments)) }, omvsSegmentUri(){ diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-menu/launchbar-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-menu/launchbar-menu.component.ts index d86698749..8de3c015d 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-menu/launchbar-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-menu/launchbar-menu.component.ts @@ -145,7 +145,8 @@ export class LaunchbarMenuComponent implements MVDHosting.LoginActionInterface{ ngOnInit(): void { this.appKeyboard.keyUpEvent .subscribe((event:KeyboardEvent) => { - if (event.which === KeyCode.KEY_M) { + // TODO: Disable bottom app bar once mvd-window-manager single app mode is functional. Variable subject to change. + if (event.which === KeyCode.KEY_M && !(window as any)['GIZA_SIMPLE_CONTAINER_REQUESTED']) { this.activeToggle(); } }); diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.html index 0025cd9d2..2b9ea70b5 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.html @@ -10,9 +10,12 @@ Copyright Contributors to the Zowe Project. --> -
+
{ if (event.which === KeyCode.DOWN_ARROW) { - if(this.focusedWindow !== null) { + // TODO: Disable minimize hotkey once mvd-window-manager single app mode is functional. Variable subject to change. + if(this.focusedWindow !== null && !(window as any)['GIZA_SIMPLE_CONTAINER_REQUESTED']) { this.minimizeToggle(this.focusedWindow.windowId); } } @@ -269,12 +270,17 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe } private refreshMaximizedWindowSize(desktopWindow: DesktopWindow): void { - //this is the window viewport size, so you must subtract the header and launchbar from the height. + //This is the window viewport size, so you must subtract the header and launchbar from the height, if not in standalone mode. + let height; + if ((window as any)['GIZA_SIMPLE_CONTAINER_REQUESTED']) { + height = window.innerHeight; + } else { + height = window.innerHeight - WindowManagerService.MAXIMIZE_WINDOW_HEIGHT_OFFSET; + } desktopWindow.windowState.position = { top: 0, left: 0, width: window.innerWidth, - height: window.innerHeight - - WindowManagerService.MAXIMIZE_WINDOW_HEIGHT_OFFSET}; + height: height}; } private generateWindowId(): MVDWindowManagement.WindowId { diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/window/window.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/window/window.component.html index 0dec0622a..2a910e86d 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/window/window.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/window/window.component.html @@ -66,7 +66,8 @@ [style.background-size]="buttonSize" [style.left]="minimizeLeft" [ngStyle]="hasFocus() ? {'filter': buttonFilter} : {}" - (click)="minimizeToggle()">
+ (click)="minimizeToggle()" + *ngIf="displayMinimize">