pull/4925/head
filip mertens 5 months ago
parent 2468917483
commit a1eb9e0b9b
  1. 2
      libs/remix-ui/home-tab/src/lib/components/homeTabScamAlert.tsx
  2. 4
      libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu-buttons.tsx
  3. 2
      libs/remix-ui/workspace/src/lib/actions/workspace.ts
  4. 2
      libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
  5. 2
      libs/remix-ui/xterm/src/lib/components/remix-ui-terminal-menu-xterm.tsx

@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { appPlatformTypes, platformContext } from '@remix-ui/app'
import React, { useContext } from 'react'
import {FormattedMessage} from 'react-intl'
import { FormattedMessage } from 'react-intl'
const _paq = (window._paq = window._paq || []) // eslint-disable-line

@ -14,7 +14,7 @@ export const RemixUITerminalMenuButtons = (props: RemixUiTerminalProps) => {
const showTerminal = async(event: any): Promise<void> => {
props.plugin.call('layout', 'minimize', props.plugin.profile.name, false)
if( xtermState.terminals.length === 0) {
if ( xtermState.terminals.length === 0) {
const start_time = Date.now()
const pid = await props.plugin.call('xterm', 'createTerminal', xtermState.workingDir, null)
const end_time = Date.now()
@ -33,7 +33,7 @@ export const RemixUITerminalMenuButtons = (props: RemixUiTerminalProps) => {
<button id="tabOutput" data-id="tabOutput" className={`xtermButton btn btn-sm border-secondary mr-2 border ${!xtermState.showOutput ? '' : 'd-flex btn-secondary'}`} onClick={selectOutput}>
Output
</button>
<button data-id="tabXTerm" id="tabXTerm" className={`xtermButton btn btn-sm border-secondary ${xtermState.terminalsEnabled ? 'd-block' : 'd-none'} ${xtermState.showOutput ? 'd-none' : 'btn-secondary'}`}
<button data-id="tabXTerm" id="tabXTerm" className={`xtermButton btn btn-sm border-secondary ${xtermState.terminalsEnabled ? 'd-block' : 'd-none'} ${xtermState.showOutput ? 'd-none' : 'btn-secondary'}`}
onClick={async(e) => await showTerminal(e)}>
<span className="far fa-terminal border-0 ml-1"></span>
</button>

@ -763,7 +763,7 @@ export const getGitRepoCurrentBranch = async (workspaceName: string) => {
export const showAllBranches = async () => {
if (plugin.registry.get('platform').api.isDesktop()) return
const isActive = await plugin.call('manager', 'isActive', 'dgit')
const isActive = await plugin.call('manager', 'isActive', 'dgit')
if (!isActive) await plugin.call('manager', 'activatePlugin', 'dgit')
plugin.call('menuicons', 'select', 'dgit')
plugin.call('dgit', 'open', 'branches')

@ -871,7 +871,7 @@ export function Workspace() {
htmlFor="initGitRepository"
data-id="initGitRepositoryLabel"
className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
title={intl.formatMessage({id: 'filePanel.initGitRepoTitle'})}
title={intl.formatMessage({ id: 'filePanel.initGitRepoTitle' })}
>
<FormattedMessage id="filePanel.initGitRepositoryLabel" />
</label>}

@ -36,7 +36,7 @@ export const RemixUIXtermMenu = (props: RemixUiTerminalProps) => {
<CustomTooltip tooltipText={<FormattedMessage id='xterm.shells' defaultMessage='Shells' />}>
<Dropdown as={ButtonGroup}>
<Dropdown.Toggle data-id='select_shell' split variant="" id="dropdown-split-basic" />
<Dropdown.Menu className='custom-dropdown-items remixui_menuwidth'>
<Dropdown.Menu className='custom-dropdown-items remixui_menuwidth'>
{xtermState.shells.map((shell, index) => {
return (<Dropdown.Item data-id={`select_${shell}`} key={index} onClick={async () => await onCreateTerminal(shell)}>{shell}</Dropdown.Item>)
})}

Loading…
Cancel
Save