"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "app/src/ui/app.tsx" between
desktop-release-2.7.2-linux1.tar.gz and desktop-release-2.8.0-linux1.tar.gz

About: GitHub Desktop (Linux) is an open source Electron-based GitHub app. It is written in TypeScript and uses React. A fork of GitHub Desktop to support various Linux distributions. Release candidate.

app.tsx  (desktop-release-2.7.2-linux1):app.tsx  (desktop-release-2.8.0-linux1)
skipping to change at line 110 skipping to change at line 110
import { import {
initializeNewRebaseFlow, initializeNewRebaseFlow,
initializeRebaseFlowForConflictedRepository, initializeRebaseFlowForConflictedRepository,
isCurrentBranchForcePush, isCurrentBranchForcePush,
} from '../lib/rebase' } from '../lib/rebase'
import { BannerType } from '../models/banner' import { BannerType } from '../models/banner'
import { StashAndSwitchBranch } from './stash-changes/stash-and-switch-branch-di alog' import { StashAndSwitchBranch } from './stash-changes/stash-and-switch-branch-di alog'
import { OverwriteStash } from './stash-changes/overwrite-stashed-changes-dialog ' import { OverwriteStash } from './stash-changes/overwrite-stashed-changes-dialog '
import { ConfirmDiscardStashDialog } from './stashing/confirm-discard-stash' import { ConfirmDiscardStashDialog } from './stashing/confirm-discard-stash'
import { CreateTutorialRepositoryDialog } from './no-repositories/create-tutoria l-repository-dialog' import { CreateTutorialRepositoryDialog } from './no-repositories/create-tutoria l-repository-dialog'
import { enableForkyCreateBranchUI } from '../lib/feature-flag'
import { ConfirmExitTutorial } from './tutorial' import { ConfirmExitTutorial } from './tutorial'
import { TutorialStep, isValidTutorialStep } from '../models/tutorial-step' import { TutorialStep, isValidTutorialStep } from '../models/tutorial-step'
import { WorkflowPushRejectedDialog } from './workflow-push-rejected/workflow-pu sh-rejected' import { WorkflowPushRejectedDialog } from './workflow-push-rejected/workflow-pu sh-rejected'
import { SAMLReauthRequiredDialog } from './saml-reauth-required/saml-reauth-req uired' import { SAMLReauthRequiredDialog } from './saml-reauth-required/saml-reauth-req uired'
import { CreateForkDialog } from './forks/create-fork-dialog' import { CreateForkDialog } from './forks/create-fork-dialog'
import { findDefaultUpstreamBranch } from '../lib/branch' import { findDefaultUpstreamBranch } from '../lib/branch'
import { GitHubRepository } from '../models/github-repository' import { GitHubRepository } from '../models/github-repository'
import { CreateTag } from './create-tag' import { CreateTag } from './create-tag'
import { DeleteTag } from './delete-tag' import { DeleteTag } from './delete-tag'
import { ChooseForkSettings } from './choose-fork-settings' import { ChooseForkSettings } from './choose-fork-settings'
skipping to change at line 138 skipping to change at line 137
ChooseTargetBranchesStep, ChooseTargetBranchesStep,
} from '../models/cherry-pick' } from '../models/cherry-pick'
import { getAccountForRepository } from '../lib/get-account-for-repository' import { getAccountForRepository } from '../lib/get-account-for-repository'
import { CommitOneLine } from '../models/commit' import { CommitOneLine } from '../models/commit'
import { WorkingDirectoryStatus } from '../models/status' import { WorkingDirectoryStatus } from '../models/status'
import { DragElementType } from '../models/drag-element' import { DragElementType } from '../models/drag-element'
import { CherryPickCommit } from './drag-elements/cherry-pick-commit' import { CherryPickCommit } from './drag-elements/cherry-pick-commit'
import classNames from 'classnames' import classNames from 'classnames'
import { dragAndDropManager } from '../lib/drag-and-drop-manager' import { dragAndDropManager } from '../lib/drag-and-drop-manager'
import { MoveToApplicationsFolder } from './move-to-applications-folder' import { MoveToApplicationsFolder } from './move-to-applications-folder'
import { ChangeRepositoryAlias } from './change-repository-alias/change-reposito ry-alias-dialog'
const MinuteInMilliseconds = 1000 * 60 const MinuteInMilliseconds = 1000 * 60
const HourInMilliseconds = MinuteInMilliseconds * 60 const HourInMilliseconds = MinuteInMilliseconds * 60
/** /**
* Check for updates every 4 hours * Check for updates every 4 hours
*/ */
const UpdateCheckInterval = 4 * HourInMilliseconds const UpdateCheckInterval = 4 * HourInMilliseconds
/** /**
skipping to change at line 314 skipping to change at line 314
this.props.dispatcher.installGlobalLFSFilters(false) this.props.dispatcher.installGlobalLFSFilters(false)
setInterval(() => this.checkForUpdates(true), UpdateCheckInterval) setInterval(() => this.checkForUpdates(true), UpdateCheckInterval)
this.checkForUpdates(true) this.checkForUpdates(true)
log.info(`launching: ${getVersion()} (${getOS()})`) log.info(`launching: ${getVersion()} (${getOS()})`)
log.info(`execPath: '${process.execPath}'`) log.info(`execPath: '${process.execPath}'`)
// Only show the popup in beta/production releases and mac machines // Only show the popup in beta/production releases and mac machines
if (__DEV__ === false && remote.app.isInApplicationsFolder?.() === false) { if (
__DEV__ === false &&
this.state.askToMoveToApplicationsFolderSetting &&
remote.app.isInApplicationsFolder?.() === false
) {
this.showPopup({ type: PopupType.MoveToApplicationsFolder }) this.showPopup({ type: PopupType.MoveToApplicationsFolder })
} }
} }
private onMenuEvent(name: MenuEvent): any { private onMenuEvent(name: MenuEvent): any {
// Don't react to menu events when an error dialog is shown. // Don't react to menu events when an error dialog is shown.
if (this.state.errors.length) { if (this.state.errors.length) {
return return
} }
skipping to change at line 1509 skipping to change at line 1513
const repository = popup.repository const repository = popup.repository
if (branchesState.tip.kind === TipState.Unknown) { if (branchesState.tip.kind === TipState.Unknown) {
onPopupDismissedFn() onPopupDismissedFn()
return null return null
} }
let upstreamGhRepo: GitHubRepository | null = null let upstreamGhRepo: GitHubRepository | null = null
let upstreamDefaultBranch: Branch | null = null let upstreamDefaultBranch: Branch | null = null
if ( if (isRepositoryWithGitHubRepository(repository)) {
enableForkyCreateBranchUI() &&
isRepositoryWithGitHubRepository(repository)
) {
upstreamGhRepo = getNonForkGitHubRepository(repository) upstreamGhRepo = getNonForkGitHubRepository(repository)
upstreamDefaultBranch = findDefaultUpstreamBranch( upstreamDefaultBranch = findDefaultUpstreamBranch(
repository, repository,
branchesState.allBranches branchesState.allBranches
) )
} }
return ( return (
<CreateBranch <CreateBranch
key="create-branch" key="create-branch"
skipping to change at line 2057 skipping to change at line 2058
) )
} }
case PopupType.MoveToApplicationsFolder: { case PopupType.MoveToApplicationsFolder: {
return ( return (
<MoveToApplicationsFolder <MoveToApplicationsFolder
dispatcher={this.props.dispatcher} dispatcher={this.props.dispatcher}
onDismissed={onPopupDismissedFn} onDismissed={onPopupDismissedFn}
/> />
) )
} }
case PopupType.ChangeRepositoryAlias: {
return (
<ChangeRepositoryAlias
dispatcher={this.props.dispatcher}
repository={popup.repository}
onDismissed={onPopupDismissedFn}
/>
)
}
default: default:
return assertNever(popup, `Unknown popup type: ${popup}`) return assertNever(popup, `Unknown popup type: ${popup}`)
} }
} }
private onExitTutorialToHomeScreen = () => { private onExitTutorialToHomeScreen = () => {
const tutorialRepository = this.getSelectedTutorialRepository() const tutorialRepository = this.getSelectedTutorialRepository()
if (!tutorialRepository) { if (!tutorialRepository) {
return false return false
} }
skipping to change at line 2376 skipping to change at line 2386
} }
private renderRepositoryToolbarButton() { private renderRepositoryToolbarButton() {
const selection = this.state.selectedState const selection = this.state.selectedState
const repository = selection ? selection.repository : null const repository = selection ? selection.repository : null
let icon: OcticonSymbol let icon: OcticonSymbol
let title: string let title: string
if (repository) { if (repository) {
const alias = repository instanceof Repository ? repository.alias : null
icon = iconForRepository(repository) icon = iconForRepository(repository)
title = repository.name title = alias ?? repository.name
} else if (this.state.repositories.length > 0) { } else if (this.state.repositories.length > 0) {
icon = OcticonSymbol.repo icon = OcticonSymbol.repo
title = __DARWIN__ ? 'Select a Repository' : 'Select a repository' title = __DARWIN__ ? 'Select a Repository' : 'Select a repository'
} else { } else {
icon = OcticonSymbol.repo icon = OcticonSymbol.repo
title = __DARWIN__ ? 'No Repositories' : 'No repositories' title = __DARWIN__ ? 'No Repositories' : 'No repositories'
} }
const isOpen = const isOpen =
this.state.currentFoldout && this.state.currentFoldout &&
skipping to change at line 2672 skipping to change at line 2683
state={selectedState.state} state={selectedState.state}
dispatcher={this.props.dispatcher} dispatcher={this.props.dispatcher}
emoji={state.emoji} emoji={state.emoji}
sidebarWidth={state.sidebarWidth} sidebarWidth={state.sidebarWidth}
commitSummaryWidth={state.commitSummaryWidth} commitSummaryWidth={state.commitSummaryWidth}
stashedFilesWidth={state.stashedFilesWidth} stashedFilesWidth={state.stashedFilesWidth}
issuesStore={this.props.issuesStore} issuesStore={this.props.issuesStore}
gitHubUserStore={this.props.gitHubUserStore} gitHubUserStore={this.props.gitHubUserStore}
onViewCommitOnGitHub={this.onViewCommitOnGitHub} onViewCommitOnGitHub={this.onViewCommitOnGitHub}
imageDiffType={state.imageDiffType} imageDiffType={state.imageDiffType}
hideWhitespaceInDiff={state.hideWhitespaceInDiff} hideWhitespaceInChangesDiff={state.hideWhitespaceInChangesDiff}
hideWhitespaceInHistoryDiff={state.hideWhitespaceInHistoryDiff}
showSideBySideDiff={state.showSideBySideDiff} showSideBySideDiff={state.showSideBySideDiff}
focusCommitMessage={state.focusCommitMessage} focusCommitMessage={state.focusCommitMessage}
askForConfirmationOnDiscardChanges={ askForConfirmationOnDiscardChanges={
state.askForConfirmationOnDiscardChanges state.askForConfirmationOnDiscardChanges
} }
accounts={state.accounts} accounts={state.accounts}
externalEditorLabel={externalEditorLabel} externalEditorLabel={externalEditorLabel}
resolvedExternalEditor={state.resolvedExternalEditor} resolvedExternalEditor={state.resolvedExternalEditor}
onOpenInExternalEditor={this.openFileInExternalEditor} onOpenInExternalEditor={this.openFileInExternalEditor}
appMenu={state.appMenuState[0]} appMenu={state.appMenuState[0]}
 End of changes. 8 change blocks. 
8 lines changed or deleted 20 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)