self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

Tools: Renamed package namespace from @joplinapp to @joplin

Browse Source
This commit is contained in:
Laurent Cozic
2020-11-07 15:59:37 +00:00
parent f950e9b03f
commit 04bfbec96b
330 changed files with 1284 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/app-desktop/gui/ClipperConfigScreen.jsx
View File

@@ -1,10 +1,10 @@
const React = require('react');
const { connect } = require('react-redux');
const bridge = require('electron').remote.require('./bridge').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const { _ } = require('@joplinapp/lib/locale');
const ClipperServer = require('@joplinapp/lib/ClipperServer');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { themeStyle } = require('@joplin/lib/theme');
const { _ } = require('@joplin/lib/locale');
const ClipperServer = require('@joplin/lib/ClipperServer');
const Setting = require('@joplin/lib/models/Setting').default;
const { clipboard } = require('electron');
const ExtensionBadge = require('./ExtensionBadge.min');

2
packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx
View File

@@ -1,6 +1,6 @@
import * as React from 'react';
import Button, { ButtonLevel } from '../Button/Button';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const styled = require('styled-components').default;
interface Props {

12
packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx
View File

@@ -2,13 +2,13 @@ import * as React from 'react';
import SideBar from './SideBar';
import ButtonBar from './ButtonBar';
import Button, { ButtonLevel } from '../Button/Button';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const { connect } = require('react-redux');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const pathUtils = require('@joplinapp/lib/path-utils');
const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry');
const shared = require('@joplinapp/lib/components/shared/config-shared.js');
const Setting = require('@joplin/lib/models/Setting').default;
const { themeStyle } = require('@joplin/lib/theme');
const pathUtils = require('@joplin/lib/path-utils');
const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry');
const shared = require('@joplin/lib/components/shared/config-shared.js');
const bridge = require('electron').remote.require('./bridge').default;
const { EncryptionConfigScreen } = require('../EncryptionConfigScreen.min');
const { ClipperConfigScreen } = require('../ClipperConfigScreen.min');

2
packages/app-desktop/gui/ConfigScreen/SideBar.tsx
View File

@@ -1,6 +1,6 @@
import * as React from 'react';
const styled = require('styled-components').default;
const Setting = require('@joplinapp/lib/models/Setting').default;
const Setting = require('@joplin/lib/models/Setting').default;
interface Props {
selection: string,

4
packages/app-desktop/gui/DialogButtonRow.jsx
View File

@@ -1,6 +1,6 @@
const React = require('react');
const { _ } = require('@joplinapp/lib/locale');
const { themeStyle } = require('@joplinapp/lib/theme');
const { _ } = require('@joplin/lib/locale');
const { themeStyle } = require('@joplin/lib/theme');
function DialogButtonRow(props) {
const theme = themeStyle(props.themeId);

6
packages/app-desktop/gui/DropboxLoginScreen.tsx
View File

@@ -1,11 +1,11 @@
import * as React from 'react';
import ButtonBar from './ConfigScreen/ButtonBar';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const { connect } = require('react-redux');
const bridge = require('electron').remote.require('./bridge').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const Shared = require('@joplinapp/lib/components/shared/dropbox-login-shared');
const { themeStyle } = require('@joplin/lib/theme');
const Shared = require('@joplin/lib/components/shared/dropbox-login-shared');
interface Props {
themeId: string,

14
packages/app-desktop/gui/EncryptionConfigScreen.jsx
View File

@@ -1,13 +1,13 @@
const React = require('react');
const { connect } = require('react-redux');
const Setting = require('@joplinapp/lib/models/Setting').default;
const EncryptionService = require('@joplinapp/lib/services/EncryptionService');
const { themeStyle } = require('@joplinapp/lib/theme');
const { _ } = require('@joplinapp/lib/locale');
const time = require('@joplinapp/lib/time').default;
const shim = require('@joplinapp/lib/shim').default;
const Setting = require('@joplin/lib/models/Setting').default;
const EncryptionService = require('@joplin/lib/services/EncryptionService');
const { themeStyle } = require('@joplin/lib/theme');
const { _ } = require('@joplin/lib/locale');
const time = require('@joplin/lib/time').default;
const shim = require('@joplin/lib/shim').default;
const dialogs = require('./dialogs');
const shared = require('@joplinapp/lib/components/shared/encryption-config-shared.js');
const shared = require('@joplin/lib/components/shared/encryption-config-shared.js');
const bridge = require('electron').remote.require('./bridge').default;
class EncryptionConfigScreenComponent extends React.Component {

2
packages/app-desktop/gui/ErrorBoundary.tsx
View File

@@ -1,5 +1,5 @@
import * as React from 'react';
import versionInfo from '@joplinapp/lib/versionInfo';
import versionInfo from '@joplin/lib/versionInfo';
const packageInfo = require('../packageInfo.js');
const ipcRenderer = require('electron').ipcRenderer;

2
packages/app-desktop/gui/ExtensionBadge.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react');
const bridge = require('electron').remote.require('./bridge').default;
const styleSelector = require('./style/ExtensionBadge');
const { _ } = require('@joplinapp/lib/locale');
const { _ } = require('@joplin/lib/locale');
function platformAssets(type) {
if (type === 'firefox') {

2
packages/app-desktop/gui/HelpButton.jsx
View File

@@ -1,6 +1,6 @@
const React = require('react');
const { connect } = require('react-redux');
const { themeStyle } = require('@joplinapp/lib/theme');
const { themeStyle } = require('@joplin/lib/theme');
class HelpButtonComponent extends React.Component {
constructor() {

2
packages/app-desktop/gui/IconButton.jsx
View File

@@ -1,5 +1,5 @@
const React = require('react');
const { themeStyle } = require('@joplinapp/lib/theme');
const { themeStyle } = require('@joplin/lib/theme');
class IconButton extends React.Component {
render() {

10
packages/app-desktop/gui/ImportScreen.jsx
View File

@@ -1,10 +1,10 @@
const React = require('react');
const { connect } = require('react-redux');
const Folder = require('@joplinapp/lib/models/Folder.js');
const { themeStyle } = require('@joplinapp/lib/theme');
const { _ } = require('@joplinapp/lib/locale');
const { filename, basename } = require('@joplinapp/lib/path-utils');
const { importEnex } = require('@joplinapp/lib/import-enex');
const Folder = require('@joplin/lib/models/Folder.js');
const { themeStyle } = require('@joplin/lib/theme');
const { _ } = require('@joplin/lib/locale');
const { filename, basename } = require('@joplin/lib/path-utils');
const { importEnex } = require('@joplin/lib/import-enex');
class ImportScreenComponent extends React.Component {
UNSAFE_componentWillMount() {

6
packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx
View File

@@ -1,16 +1,16 @@
import * as React from 'react';
import { useState } from 'react';
import KeymapService, { KeymapItem } from '@joplinapp/lib/services/KeymapService';
import KeymapService, { KeymapItem } from '@joplin/lib/services/KeymapService';
import { ShortcutRecorder } from './ShortcutRecorder';
import getLabel from './utils/getLabel';
import useKeymap from './utils/useKeymap';
import useCommandStatus from './utils/useCommandStatus';
import styles_ from './styles';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const bridge = require('electron').remote.require('./bridge').default;
const shim = require('@joplinapp/lib/shim').default;
const shim = require('@joplin/lib/shim').default;
const keymapService = KeymapService.instance();

4
packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx
View File

@@ -1,10 +1,10 @@
import * as React from 'react';
import { useState, useEffect, KeyboardEvent } from 'react';
import KeymapService from '@joplinapp/lib/services/KeymapService';
import KeymapService from '@joplin/lib/services/KeymapService';
import styles_ from './styles';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const keymapService = KeymapService.instance();
export interface ShortcutRecorderProps {

2
packages/app-desktop/gui/KeymapConfig/styles/index.ts
View File

@@ -1,4 +1,4 @@
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
export default function styles(themeId: number) {
return buildStyle('KeymapConfigScreen', themeId, (theme: any) => {

6
packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts
View File

@@ -1,7 +1,7 @@
import CommandService from '@joplinapp/lib/services/CommandService';
import shim from '@joplinapp/lib/shim';
import CommandService from '@joplin/lib/services/CommandService';
import shim from '@joplin/lib/shim';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const commandService = CommandService.instance();

2
packages/app-desktop/gui/KeymapConfig/utils/useCommandStatus.ts
View File

@@ -1,5 +1,5 @@
import { useState } from 'react';
import KeymapService from '@joplinapp/lib/services/KeymapService';
import KeymapService from '@joplin/lib/services/KeymapService';
const keymapService = KeymapService.instance();

2
packages/app-desktop/gui/KeymapConfig/utils/useKeymap.ts
View File

@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
import KeymapService, { KeymapItem } from '@joplinapp/lib/services/KeymapService';
import KeymapService, { KeymapItem } from '@joplin/lib/services/KeymapService';
import getLabel from './getLabel';
const keymapService = KeymapService.instance();

24
packages/app-desktop/gui/MainScreen/MainScreen.tsx
View File

@@ -5,29 +5,29 @@ import NoteEditor from '../NoteEditor/NoteEditor';
import NoteContentPropertiesDialog from '../NoteContentPropertiesDialog';
import ShareNoteDialog from '../ShareNoteDialog';
import NoteListControls from '../NoteListControls/NoteListControls';
import CommandService from '@joplinapp/lib/services/CommandService';
import PluginService from '@joplinapp/lib/services/plugins/PluginService';
import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer';
import CommandService from '@joplin/lib/services/CommandService';
import PluginService from '@joplin/lib/services/plugins/PluginService';
import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
import SideBar from '../SideBar/SideBar';
import UserWebview from '../../services/plugins/UserWebview';
import UserWebviewDialog from '../../services/plugins/UserWebviewDialog';
import { ContainerType } from '@joplinapp/lib/services/plugins/WebviewController';
import { stateUtils } from '@joplinapp/lib/reducer';
import { ContainerType } from '@joplin/lib/services/plugins/WebviewController';
import { stateUtils } from '@joplin/lib/reducer';
import InteropServiceHelper from '../../InteropServiceHelper';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const produce = require('immer').default;
const { connect } = require('react-redux');
const { PromptDialog } = require('../PromptDialog.min.js');
const NotePropertiesDialog = require('../NotePropertiesDialog.min.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const shim = require('@joplinapp/lib/shim').default;
const { themeStyle } = require('@joplinapp/lib/theme.js');
const Setting = require('@joplin/lib/models/Setting').default;
const shim = require('@joplin/lib/shim').default;
const { themeStyle } = require('@joplin/lib/theme.js');
const bridge = require('electron').remote.require('./bridge').default;
const PluginManager = require('@joplinapp/lib/services/PluginManager');
const EncryptionService = require('@joplinapp/lib/services/EncryptionService');
const PluginManager = require('@joplin/lib/services/PluginManager');
const EncryptionService = require('@joplin/lib/services/EncryptionService');
const ipcRenderer = require('electron').ipcRenderer;
const time = require('@joplinapp/lib/time').default;
const time = require('@joplin/lib/time').default;
const styled = require('styled-components').default;
const StyledUserWebviewDialogContainer = styled.div`

12
packages/app-desktop/gui/MainScreen/commands/editAlarm.ts
View File

@@ -1,9 +1,9 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import eventManager from '@joplinapp/lib/eventManager';
import { _ } from '@joplinapp/lib/locale';
import { stateUtils } from '@joplinapp/lib/reducer';
const Note = require('@joplinapp/lib/models/Note');
const time = require('@joplinapp/lib/time').default;
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import eventManager from '@joplin/lib/eventManager';
import { _ } from '@joplin/lib/locale';
import { stateUtils } from '@joplin/lib/reducer';
const Note = require('@joplin/lib/models/Note');
const time = require('@joplin/lib/time').default;
export const declaration:CommandDeclaration = {
name: 'editAlarm',

8
packages/app-desktop/gui/MainScreen/commands/exportPdf.ts
View File

@@ -1,8 +1,8 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import shim from '@joplinapp/lib/shim';
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import shim from '@joplin/lib/shim';
import InteropServiceHelper from '../../../InteropServiceHelper';
import { _ } from '@joplinapp/lib/locale';
const Note = require('@joplinapp/lib/models/Note');
import { _ } from '@joplin/lib/locale';
const Note = require('@joplin/lib/models/Note');
const bridge = require('electron').remote.require('./bridge').default;
export const declaration:CommandDeclaration = {

2
packages/app-desktop/gui/MainScreen/commands/hideModalMessage.ts
View File

@@ -1,4 +1,4 @@
import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
export const declaration:CommandDeclaration = {
name: 'hideModalMessage',

8
packages/app-desktop/gui/MainScreen/commands/moveToFolder.ts
View File

@@ -1,7 +1,7 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
const Folder = require('@joplinapp/lib/models/Folder');
const Note = require('@joplinapp/lib/models/Note');
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const Folder = require('@joplin/lib/models/Folder');
const Note = require('@joplin/lib/models/Note');
export const declaration:CommandDeclaration = {
name: 'moveToFolder',

6
packages/app-desktop/gui/MainScreen/commands/newFolder.ts
View File

@@ -1,6 +1,6 @@
import { CommandContext, CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
const Folder = require('@joplinapp/lib/models/Folder');
import { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const Folder = require('@joplin/lib/models/Folder');
const bridge = require('electron').remote.require('./bridge').default;
export const declaration:CommandDeclaration = {

10
packages/app-desktop/gui/MainScreen/commands/newNote.ts
View File

@@ -1,8 +1,8 @@
import { utils, CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
const Setting = require('@joplinapp/lib/models/Setting').default;
const Note = require('@joplinapp/lib/models/Note');
const TemplateUtils = require('@joplinapp/lib/TemplateUtils');
import { utils, CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const Setting = require('@joplin/lib/models/Setting').default;
const Note = require('@joplin/lib/models/Note');
const TemplateUtils = require('@joplin/lib/TemplateUtils');
export const declaration:CommandDeclaration = {
name: 'newNote',

4
packages/app-desktop/gui/MainScreen/commands/newSubFolder.ts
View File

@@ -1,5 +1,5 @@
import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'newSubFolder',

4
packages/app-desktop/gui/MainScreen/commands/newTodo.ts
View File

@@ -1,5 +1,5 @@
import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'newTodo',

2
packages/app-desktop/gui/MainScreen/commands/openFolder.ts
View File

@@ -1,4 +1,4 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
export const declaration:CommandDeclaration = {
name: 'openFolder',

6
packages/app-desktop/gui/MainScreen/commands/openNote.ts
View File

@@ -1,6 +1,6 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
const Note = require('@joplinapp/lib/models/Note');
const Folder = require('@joplinapp/lib/models/Folder');
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
const Note = require('@joplin/lib/models/Note');
const Folder = require('@joplin/lib/models/Folder');
export const declaration:CommandDeclaration = {
name: 'openNote',

2
packages/app-desktop/gui/MainScreen/commands/openTag.ts
View File

@@ -1,4 +1,4 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
export const declaration:CommandDeclaration = {
name: 'openTag',

4
packages/app-desktop/gui/MainScreen/commands/print.ts
View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const bridge = require('electron').remote.require('./bridge').default;
export const declaration:CommandDeclaration = {

6
packages/app-desktop/gui/MainScreen/commands/renameFolder.ts
View File

@@ -1,6 +1,6 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
const Folder = require('@joplinapp/lib/models/Folder');
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const Folder = require('@joplin/lib/models/Folder');
const bridge = require('electron').remote.require('./bridge').default;
export const declaration:CommandDeclaration = {

6
packages/app-desktop/gui/MainScreen/commands/renameTag.ts
View File

@@ -1,6 +1,6 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
const Tag = require('@joplinapp/lib/models/Tag');
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const Tag = require('@joplin/lib/models/Tag');
const bridge = require('electron').remote.require('./bridge').default;
export const declaration:CommandDeclaration = {

6
packages/app-desktop/gui/MainScreen/commands/search.ts
View File

@@ -1,6 +1,6 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const uuid = require('@joplinapp/lib/uuid').default;
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
const BaseModel = require('@joplin/lib/BaseModel').default;
const uuid = require('@joplin/lib/uuid').default;
export const declaration:CommandDeclaration = {
name: 'search',

6
packages/app-desktop/gui/MainScreen/commands/selectTemplate.ts
View File

@@ -1,6 +1,6 @@
import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
const TemplateUtils = require('@joplinapp/lib/TemplateUtils');
import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const TemplateUtils = require('@joplin/lib/TemplateUtils');
export const declaration:CommandDeclaration = {
name: 'selectTemplate',

6
packages/app-desktop/gui/MainScreen/commands/setTags.ts
View File

@@ -1,6 +1,6 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
const Tag = require('@joplinapp/lib/models/Tag');
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const Tag = require('@joplin/lib/models/Tag');
export const declaration:CommandDeclaration = {
name: 'setTags',

2
packages/app-desktop/gui/MainScreen/commands/showModalMessage.tsx
View File

@@ -1,5 +1,5 @@
import * as React from 'react';
import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplinapp/lib/services/CommandService';
import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService';
export const declaration:CommandDeclaration = {
name: 'showModalMessage',

8
packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.ts
View File

@@ -1,7 +1,7 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { stateUtils } from '@joplinapp/lib/reducer';
const Note = require('@joplinapp/lib/models/Note');
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
import { stateUtils } from '@joplin/lib/reducer';
const Note = require('@joplin/lib/models/Note');
export const declaration:CommandDeclaration = {
name: 'showNoteContentProperties',

6
packages/app-desktop/gui/MainScreen/commands/showNoteProperties.ts
View File

@@ -1,6 +1,6 @@
import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { stateUtils } from '@joplinapp/lib/reducer';
import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
import { stateUtils } from '@joplin/lib/reducer';
export const declaration:CommandDeclaration = {
name: 'showNoteProperties',

4
packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts
View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'showShareNoteDialog',

8
packages/app-desktop/gui/MainScreen/commands/toggleEditors.ts
View File

@@ -1,7 +1,7 @@
import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplinapp/lib/services/CommandService';
import Setting from '@joplinapp/lib/models/Setting';
import { stateUtils } from '@joplinapp/lib/reducer';
import { _ } from '@joplinapp/lib/locale';
import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService';
import Setting from '@joplin/lib/models/Setting';
import { stateUtils } from '@joplin/lib/reducer';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'toggleEditors',

4
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.ts
View File

@@ -1,5 +1,5 @@
import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'toggleNoteList',

4
packages/app-desktop/gui/MainScreen/commands/toggleSideBar.ts
View File

@@ -1,5 +1,5 @@
import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'toggleSideBar',

4
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.ts
View File

@@ -1,5 +1,5 @@
import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'toggleVisiblePanes',

34
packages/app-desktop/gui/MenuBar.tsx
View File

@@ -1,30 +1,30 @@
import { useEffect, useState, useRef, useCallback } from 'react';
import { AppState } from '../app';
import InteropService from '@joplinapp/lib/services/interop/InteropService';
import { stateUtils } from '@joplinapp/lib/reducer';
import CommandService from '@joplinapp/lib/services/CommandService';
import MenuUtils from '@joplinapp/lib/services/commands/MenuUtils';
import KeymapService from '@joplinapp/lib/services/KeymapService';
import { PluginStates, utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer';
import shim from '@joplinapp/lib/shim';
import Setting from '@joplinapp/lib/models/Setting';
import versionInfo from '@joplinapp/lib/versionInfo';
import { Module } from '@joplinapp/lib/services/interop/types';
import InteropService from '@joplin/lib/services/interop/InteropService';
import { stateUtils } from '@joplin/lib/reducer';
import CommandService from '@joplin/lib/services/CommandService';
import MenuUtils from '@joplin/lib/services/commands/MenuUtils';
import KeymapService from '@joplin/lib/services/KeymapService';
import { PluginStates, utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
import shim from '@joplin/lib/shim';
import Setting from '@joplin/lib/models/Setting';
import versionInfo from '@joplin/lib/versionInfo';
import { Module } from '@joplin/lib/services/interop/types';
import InteropServiceHelper from '../InteropServiceHelper';
import { _ } from '@joplinapp/lib/locale';
import { MenuItem, MenuItemLocation } from '@joplinapp/lib/services/plugins/api/types';
import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext';
import SpellCheckerService from '@joplinapp/lib/services/spellChecker/SpellCheckerService';
import { _ } from '@joplin/lib/locale';
import { MenuItem, MenuItemLocation } from '@joplin/lib/services/plugins/api/types';
import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext';
import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService';
import menuCommandNames from './menuCommandNames';
const { connect } = require('react-redux');
const { reg } = require('@joplinapp/lib/registry.js');
const { reg } = require('@joplin/lib/registry.js');
const packageInfo = require('../packageInfo.js');
const bridge = require('electron').remote.require('./bridge').default;
const { shell, clipboard } = require('electron');
const Menu = bridge().Menu;
const PluginManager = require('@joplinapp/lib/services/PluginManager');
const TemplateUtils = require('@joplinapp/lib/TemplateUtils');
const PluginManager = require('@joplin/lib/services/PluginManager');
const TemplateUtils = require('@joplin/lib/TemplateUtils');
const menuUtils = new MenuUtils(CommandService.instance());

4
packages/app-desktop/gui/MultiNoteActions.tsx
View File

@@ -1,8 +1,8 @@
import { PluginStates } from '@joplinapp/lib/services/plugins/reducer';
import { PluginStates } from '@joplin/lib/services/plugins/reducer';
import * as React from 'react';
import NoteListUtils from './utils/NoteListUtils';
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
const bridge = require('electron').remote.require('./bridge').default;
interface MultiNoteActionsProps {

2
packages/app-desktop/gui/Navigator.jsx
View File

@@ -1,6 +1,6 @@
const React = require('react');
const Component = React.Component;
const Setting = require('@joplinapp/lib/models/Setting').default;
const Setting = require('@joplin/lib/models/Setting').default;
const { connect } = require('react-redux');
const bridge = require('electron').remote.require('./bridge').default;

6
packages/app-desktop/gui/NoteContentPropertiesDialog.tsx
View File

@@ -1,10 +1,10 @@
import * as React from 'react';
import { useState, useEffect } from 'react';
import { _ } from '@joplinapp/lib/locale';
const { themeStyle } = require('@joplinapp/lib/theme');
import { _ } from '@joplin/lib/locale';
const { themeStyle } = require('@joplin/lib/theme');
const DialogButtonRow = require('./DialogButtonRow.min');
const Countable = require('countable');
const markupLanguageUtils = require('@joplinapp/lib/markupLanguageUtils').default;
const markupLanguageUtils = require('@joplin/lib/markupLanguageUtils').default;
interface NoteContentPropertiesDialogProps {
themeId: number,

16
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
View File

@@ -12,20 +12,20 @@ import { RenderedBody, defaultRenderedBody } from './utils/types';
import NoteTextViewer from '../../../NoteTextViewer';
import Editor from './Editor';
import usePluginServiceRegistration from '../../utils/usePluginServiceRegistration';
import Setting from '@joplinapp/lib/models/Setting';
import { _ } from '@joplinapp/lib/locale';
import Setting from '@joplin/lib/models/Setting';
import { _ } from '@joplin/lib/locale';
import bridge from '../../../../services/bridge';
import markdownUtils from '@joplinapp/lib/markdownUtils';
import shim from '@joplinapp/lib/shim';
import markdownUtils from '@joplin/lib/markdownUtils';
import shim from '@joplin/lib/shim';
const Note = require('@joplinapp/lib/models/Note.js');
const Note = require('@joplin/lib/models/Note.js');
const { clipboard } = require('electron');
const shared = require('@joplinapp/lib/components/shared/note-screen-shared.js');
const shared = require('@joplin/lib/components/shared/note-screen-shared.js');
const Menu = bridge().Menu;
const MenuItem = bridge().MenuItem;
const { reg } = require('@joplinapp/lib/registry.js');
const { reg } = require('@joplin/lib/registry.js');
const dialogs = require('../../../dialogs');
const { themeStyle } = require('@joplinapp/lib/theme');
const { themeStyle } = require('@joplin/lib/theme');
function markupRenderOptions(override: any = null) {
return { ...override };

4
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
View File

@@ -25,9 +25,9 @@ import 'codemirror/keymap/sublime'; // Used for swapLineUp and swapLineDown
import 'codemirror/mode/meta';
// import eventManager from '@joplinapp/lib/eventManager';
// import eventManager from '@joplin/lib/eventManager';
const { reg } = require('@joplinapp/lib/registry.js');
const { reg } = require('@joplin/lib/registry.js');
// Based on http://pypl.github.io/PYPL.html
const topLanguages = [

10
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.tsx
View File

@@ -1,12 +1,12 @@
import * as React from 'react';
import CommandService from '@joplinapp/lib/services/CommandService';
import CommandService from '@joplin/lib/services/CommandService';
import ToolbarBase from '../../../ToolbarBase';
import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer';
import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
import { connect } from 'react-redux';
import { AppState } from '../../../../app';
import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext';
const { buildStyle } = require('@joplinapp/lib/theme');
import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext';
const { buildStyle } = require('@joplin/lib/theme');
interface ToolbarProps {
themeId: number,

2
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.ts
View File

@@ -1,5 +1,5 @@
import { NoteBodyEditorProps } from '../../../utils/types';
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
export default function styles(props: NoteBodyEditorProps) {
return buildStyle('CodeMirror', props.themeId, (theme: any) => {

2
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.ts
View File

@@ -1,5 +1,5 @@
import { useEffect, useCallback, useRef, useState } from 'react';
import shim from '@joplinapp/lib/shim';
import shim from '@joplin/lib/shim';
export function cursorPositionToTextOffset(cursorPos: any, body: string) {
if (!body) return 0;

2
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.ts
View File

@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from 'react';
import shim from '@joplinapp/lib/shim';
import shim from '@joplin/lib/shim';
export default function useEditorSearch(CodeMirror: any) {

2
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.ts
View File

@@ -1,6 +1,6 @@
import 'codemirror/addon/mode/multiplex';
import 'codemirror/mode/stex/stex';
import Setting from '@joplinapp/lib/models/Setting';
import Setting from '@joplin/lib/models/Setting';
// Joplin markdown is a the same as markdown mode, but it has configured defaults
// and support for katex math blocks

4
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.ts
View File

@@ -1,6 +1,6 @@
import { useEffect } from 'react';
import CommandService from '@joplinapp/lib/services/CommandService';
import shim from '@joplinapp/lib/shim';
import CommandService from '@joplin/lib/services/CommandService';
import shim from '@joplin/lib/shim';
export default function useKeymap(CodeMirror: any) {

2
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts
View File

@@ -1,4 +1,4 @@
const { isListItem, isEmptyListItem, extractListToken, olLineNumber } = require('@joplinapp/lib/markdownUtils').default;
const { isListItem, isEmptyListItem, extractListToken, olLineNumber } = require('@joplin/lib/markdownUtils').default;
// Markdown list indentation.
// If the current line starts with `markup.list` token,

18
packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx
View File

@@ -4,21 +4,21 @@ import { ScrollOptions, ScrollOptionTypes, EditorCommand, NoteBodyEditorProps }
import { resourcesStatus, commandAttachFileToBody, handlePasteEvent } from '../../utils/resourceHandling';
import useScroll from './utils/useScroll';
import styles_ from './styles';
import CommandService from '@joplinapp/lib/services/CommandService';
import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import CommandService from '@joplin/lib/services/CommandService';
import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import ToggleEditorsButton, { Value as ToggleEditorsButtonValue } from '../../../ToggleEditorsButton/ToggleEditorsButton';
import ToolbarButton from '../../../../gui/ToolbarButton/ToolbarButton';
import usePluginServiceRegistration from '../../utils/usePluginServiceRegistration';
import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer';
import { _, closestSupportedLocale } from '@joplinapp/lib/locale';
import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
import { _, closestSupportedLocale } from '@joplin/lib/locale';
import setupContextMenu from './utils/setupContextMenu';
const { MarkupToHtml } = require('@joplinapp/renderer');
const { MarkupToHtml } = require('@joplin/renderer');
const taboverride = require('taboverride');
const { reg } = require('@joplinapp/lib/registry.js');
const BaseItem = require('@joplinapp/lib/models/BaseItem');
const shim = require('@joplinapp/lib/shim').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const { reg } = require('@joplin/lib/registry.js');
const BaseItem = require('@joplin/lib/models/BaseItem');
const shim = require('@joplin/lib/shim').default;
const { themeStyle } = require('@joplin/lib/theme');
const { clipboard } = require('electron');
const supportedLocales = require('./supportedLocales');

2
packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.ts
View File

@@ -1,5 +1,5 @@
import { NoteBodyEditorProps } from '../../../utils/types';
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
export default function styles(props:NoteBodyEditorProps) {
return buildStyle(['TinyMCE', props.style.width, props.style.height], props.themeId, (theme:any) => {

4
packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.ts
View File

@@ -1,7 +1,7 @@
import SpellCheckerService from '@joplinapp/lib/services/spellChecker/SpellCheckerService';
import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService';
import bridge from '../../../../../services/bridge';
import { menuItems, ContextMenuOptions, ContextMenuItemType } from '../../../utils/contextMenu';
const Resource = require('@joplinapp/lib/models/Resource');
const Resource = require('@joplin/lib/models/Resource');
// x and y are the absolute coordinates, as returned by the context-menu event
// handler on the webContent. This function will return null if the point is

2
packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.ts
View File

@@ -1,5 +1,5 @@
import { useEffect, useCallback, useRef } from 'react';
import shim from '@joplinapp/lib/shim';
import shim from '@joplin/lib/shim';
interface HookDependencies {
editor:any,

26
packages/app-desktop/gui/NoteEditor/NoteEditor.tsx
View File

@@ -15,28 +15,28 @@ import useFormNote, { OnLoadEvent } from './utils/useFormNote';
import useFolder from './utils/useFolder';
import styles_ from './styles';
import { NoteEditorProps, FormNote, ScrollOptions, ScrollOptionTypes, OnChangeEvent, NoteBodyEditorProps } from './utils/types';
import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index';
import CommandService from '@joplinapp/lib/services/CommandService';
import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
import CommandService from '@joplin/lib/services/CommandService';
import ToolbarButton from '../ToolbarButton/ToolbarButton';
import Button, { ButtonLevel } from '../Button/Button';
import eventManager from '@joplinapp/lib/eventManager';
import eventManager from '@joplin/lib/eventManager';
import { AppState } from '../../app';
import ToolbarButtonUtils from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import { _ } from '@joplinapp/lib/locale';
import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext';
import ToolbarButtonUtils from '@joplin/lib/services/commands/ToolbarButtonUtils';
import { _ } from '@joplin/lib/locale';
import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext';
import TagList from '../TagList';
import NoteTitleBar from './NoteTitle/NoteTitleBar';
import markupLanguageUtils from '@joplinapp/lib/markupLanguageUtils';
import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
import usePrevious from '../hooks/usePrevious';
import Setting from '@joplinapp/lib/models/Setting';
import Setting from '@joplin/lib/models/Setting';
const { themeStyle } = require('@joplinapp/lib/theme');
const { substrWithEllipsis } = require('@joplinapp/lib/string-utils');
const { themeStyle } = require('@joplin/lib/theme');
const { substrWithEllipsis } = require('@joplin/lib/string-utils');
const NoteSearchBar = require('../NoteSearchBar.min.js');
const { reg } = require('@joplinapp/lib/registry.js');
const Note = require('@joplinapp/lib/models/Note.js');
const { reg } = require('@joplin/lib/registry.js');
const Note = require('@joplin/lib/models/Note.js');
const bridge = require('electron').remote.require('./bridge').default;
const ExternalEditWatcher = require('@joplinapp/lib/services/ExternalEditWatcher');
const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher');
const NoteRevisionViewer = require('../NoteRevisionViewer.min');
const commands = [

8
packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx
View File

@@ -1,10 +1,10 @@
import * as React from 'react';
import { _ } from '@joplinapp/lib/locale';
import CommandService from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
import CommandService from '@joplin/lib/services/CommandService';
import { ChangeEvent, useCallback } from 'react';
import NoteToolbar from '../../NoteToolbar/NoteToolbar';
import { buildStyle } from '@joplinapp/lib/theme';
import time from '@joplinapp/lib/time';
import { buildStyle } from '@joplin/lib/theme';
import time from '@joplin/lib/time';
interface Props {
themeId: number,

4
packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts
View File

@@ -1,5 +1,5 @@
import { CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const declarations:CommandDeclaration[] = [
{

4
packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.ts
View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'focusElementNoteBody',

4
packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.ts
View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'focusElementNoteTitle',

4
packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.ts
View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'showLocalSearch',

2
packages/app-desktop/gui/NoteEditor/commands/showRevisions.ts
View File

@@ -1,4 +1,4 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
export const declaration:CommandDeclaration = {
name: 'showRevisions',

2
packages/app-desktop/gui/NoteEditor/styles/index.ts
View File

@@ -1,6 +1,6 @@
import { NoteEditorProps } from '../utils/types';
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
export default function styles(props: NoteEditorProps) {
return buildStyle(['NoteEditor'], props.themeId, (theme: any) => {

8
packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts
View File

@@ -1,13 +1,13 @@
import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplinapp/lib/locale';
import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplin/lib/locale';
const bridge = require('electron').remote.require('./bridge').default;
const Menu = bridge().Menu;
const MenuItem = bridge().MenuItem;
const Resource = require('@joplinapp/lib/models/Resource.js');
const Resource = require('@joplin/lib/models/Resource.js');
const fs = require('fs-extra');
const { clipboard } = require('electron');
const { toSystemSlashes } = require('@joplinapp/lib/path-utils');
const { toSystemSlashes } = require('@joplin/lib/path-utils');
export enum ContextMenuItemType {
None = '',

6
packages/app-desktop/gui/NoteEditor/utils/index.ts
View File

@@ -1,8 +1,8 @@
import { FormNote } from './types';
const HtmlToMd = require('@joplinapp/lib/HtmlToMd');
const Note = require('@joplinapp/lib/models/Note');
const { MarkupToHtml } = require('@joplinapp/renderer');
const HtmlToMd = require('@joplin/lib/HtmlToMd');
const Note = require('@joplin/lib/models/Note');
const { MarkupToHtml } = require('@joplin/renderer');
export async function htmlToMarkdown(markupLanguage: number, html: string, originalCss:string): Promise<string> {
let newBody = '';

18
packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts
View File

@@ -1,14 +1,14 @@
import shim from '@joplinapp/lib/shim';
const Setting = require('@joplinapp/lib/models/Setting').default;
const Note = require('@joplinapp/lib/models/Note.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Resource = require('@joplinapp/lib/models/Resource.js');
import shim from '@joplin/lib/shim';
const Setting = require('@joplin/lib/models/Setting').default;
const Note = require('@joplin/lib/models/Note.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Resource = require('@joplin/lib/models/Resource.js');
const bridge = require('electron').remote.require('./bridge').default;
const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js');
const { reg } = require('@joplinapp/lib/registry.js');
const joplinRendererUtils = require('@joplinapp/renderer').utils;
const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js');
const { reg } = require('@joplin/lib/registry.js');
const joplinRendererUtils = require('@joplin/renderer').utils;
const { clipboard } = require('electron');
const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime;
const mimeUtils = require('@joplin/lib/mime-utils.js').mime;
const md5 = require('md5');
export async function handleResourceDownloadMode(noteBody: string) {

6
packages/app-desktop/gui/NoteEditor/utils/types.ts
View File

@@ -1,7 +1,7 @@
// eslint-disable-next-line no-unused-vars
import AsyncActionQueue from '@joplinapp/lib/AsyncActionQueue';
import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import { PluginStates } from '@joplinapp/lib/services/plugins/reducer';
import AsyncActionQueue from '@joplin/lib/AsyncActionQueue';
import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import { PluginStates } from '@joplin/lib/services/plugins/reducer';
export interface ToolbarButtonInfos {
[key:string]: ToolbarButtonInfo;

2
packages/app-desktop/gui/NoteEditor/utils/useDropHandler.ts
View File

@@ -1,5 +1,5 @@
import { useCallback } from 'react';
const Note = require('@joplinapp/lib/models/Note.js');
const Note = require('@joplin/lib/models/Note.js');
interface HookDependencies {
editorRef:any,

2
packages/app-desktop/gui/NoteEditor/utils/useFolder.ts
View File

@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
const Folder = require('@joplinapp/lib/models/Folder');
const Folder = require('@joplin/lib/models/Folder');
interface HookDependencies {
folderId: string,

18
packages/app-desktop/gui/NoteEditor/utils/useFormNote.ts
View File

@@ -1,17 +1,17 @@
import { useState, useEffect, useCallback } from 'react';
import { FormNote, defaultFormNote, ResourceInfos } from './types';
import { clearResourceCache, attachedResources } from './resourceHandling';
import AsyncActionQueue from '@joplinapp/lib/AsyncActionQueue';
import AsyncActionQueue from '@joplin/lib/AsyncActionQueue';
import { handleResourceDownloadMode } from './resourceHandling';
const { MarkupToHtml } = require('@joplinapp/renderer');
const HtmlToHtml = require('@joplinapp/renderer/HtmlToHtml');
const { MarkupToHtml } = require('@joplin/renderer');
const HtmlToHtml = require('@joplin/renderer/HtmlToHtml');
const usePrevious = require('../../hooks/usePrevious').default;
const Note = require('@joplinapp/lib/models/Note');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { reg } = require('@joplinapp/lib/registry.js');
const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js');
const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker.js');
const ResourceEditWatcher = require('@joplinapp/lib/services/ResourceEditWatcher/index').default;
const Note = require('@joplin/lib/models/Note');
const Setting = require('@joplin/lib/models/Setting').default;
const { reg } = require('@joplin/lib/registry.js');
const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js');
const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker.js');
const ResourceEditWatcher = require('@joplin/lib/services/ResourceEditWatcher/index').default;
export interface OnLoadEvent {
formNote: FormNote,

12
packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts
View File

@@ -1,12 +1,12 @@
import { PluginStates } from '@joplinapp/lib/services/plugins/reducer';
import contentScriptsToRendererRules from '@joplinapp/lib/services/plugins/utils/contentScriptsToRendererRules';
import { PluginStates } from '@joplin/lib/services/plugins/reducer';
import contentScriptsToRendererRules from '@joplin/lib/services/plugins/utils/contentScriptsToRendererRules';
import { useCallback, useMemo } from 'react';
import { ResourceInfos } from './types';
import markupLanguageUtils from '@joplinapp/lib/markupLanguageUtils';
import Setting from '@joplinapp/lib/models/Setting';
import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
import Setting from '@joplin/lib/models/Setting';
const { themeStyle } = require('@joplinapp/lib/theme');
const Note = require('@joplinapp/lib/models/Note');
const { themeStyle } = require('@joplin/lib/theme');
const Note = require('@joplin/lib/models/Note');
interface HookDependencies {
themeId: number,

18
packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts
View File

@@ -1,16 +1,16 @@
import { useCallback } from 'react';
import { FormNote } from './types';
import contextMenu from './contextMenu';
import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplinapp/lib/locale';
const BaseItem = require('@joplinapp/lib/models/BaseItem');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Resource = require('@joplinapp/lib/models/Resource.js');
import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplin/lib/locale';
const BaseItem = require('@joplin/lib/models/BaseItem');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Resource = require('@joplin/lib/models/Resource.js');
const bridge = require('electron').remote.require('./bridge').default;
const { urlDecode } = require('@joplinapp/lib/string-utils');
const urlUtils = require('@joplinapp/lib/urlUtils');
const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js');
const { reg } = require('@joplinapp/lib/registry.js');
const { urlDecode } = require('@joplin/lib/string-utils');
const urlUtils = require('@joplin/lib/urlUtils');
const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js');
const { reg } = require('@joplin/lib/registry.js');
export default function useMessageHandler(scrollWhenReady:any, setScrollWhenReady:Function, editorRef:any, setLocalSearchResultCount:Function, dispatch:Function, formNote:FormNote) {
return useCallback(async (event: any) => {

6
packages/app-desktop/gui/NoteEditor/utils/useWindowCommandHandler.ts
View File

@@ -1,9 +1,9 @@
import { useEffect } from 'react';
import { FormNote, ScrollOptionTypes } from './types';
import editorCommandDeclarations from '../commands/editorCommandDeclarations';
import CommandService, { CommandDeclaration, CommandRuntime, CommandContext } from '@joplinapp/lib/services/CommandService';
const time = require('@joplinapp/lib/time').default;
const { reg } = require('@joplinapp/lib/registry.js');
import CommandService, { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService';
const time = require('@joplin/lib/time').default;
const { reg } = require('@joplin/lib/registry.js');
const commandsWithDependencies = [
require('../commands/showLocalSearch'),

18
packages/app-desktop/gui/NoteList/NoteList.tsx
View File

@@ -1,20 +1,20 @@
import { AppState } from '../../app';
import eventManager from '@joplinapp/lib/eventManager';
import eventManager from '@joplin/lib/eventManager';
import NoteListUtils from '../utils/NoteListUtils';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const { ItemList } = require('../ItemList.min.js');
const React = require('react');
const { connect } = require('react-redux');
const time = require('@joplinapp/lib/time').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const time = require('@joplin/lib/time').default;
const { themeStyle } = require('@joplin/lib/theme');
const BaseModel = require('@joplin/lib/BaseModel').default;
const bridge = require('electron').remote.require('./bridge').default;
const Note = require('@joplinapp/lib/models/Note');
const Setting = require('@joplinapp/lib/models/Setting').default;
const Note = require('@joplin/lib/models/Note');
const Setting = require('@joplin/lib/models/Setting').default;
const NoteListItem = require('../NoteListItem').default;
const CommandService = require('@joplinapp/lib/services/CommandService.js').default;
const CommandService = require('@joplin/lib/services/CommandService.js').default;
const styled = require('styled-components').default;
const shim = require('@joplinapp/lib/shim').default;
const shim = require('@joplin/lib/shim').default;
const commands = [
require('./commands/focusElementNoteList'),

6
packages/app-desktop/gui/NoteList/commands/focusElementNoteList.ts
View File

@@ -1,6 +1,6 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { stateUtils } from '@joplinapp/lib/reducer';
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
import { stateUtils } from '@joplin/lib/reducer';
export const declaration:CommandDeclaration = {
name: 'focusElementNoteList',

2
packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
View File

@@ -2,7 +2,7 @@ import * as React from 'react';
import { useEffect, useRef } from 'react';
import SearchBar from '../SearchBar/SearchBar';
import Button, { ButtonLevel } from '../Button/Button';
import CommandService from '@joplinapp/lib/services/CommandService';
import CommandService from '@joplin/lib/services/CommandService';
import { runtime as focusSearchRuntime } from './commands/focusSearch';
const styled = require('styled-components').default;

4
packages/app-desktop/gui/NoteListControls/commands/focusSearch.ts
View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'focusSearch',

8
packages/app-desktop/gui/NoteListItem.tsx
View File

@@ -1,10 +1,10 @@
import * as React from 'react';
import { useRef, forwardRef, useImperativeHandle, useCallback } from 'react';
const { themeStyle } = require('@joplinapp/lib/theme');
const { themeStyle } = require('@joplin/lib/theme');
const Mark = require('mark.js/dist/mark.min.js');
const markJsUtils = require('@joplinapp/lib/markJsUtils');
const Note = require('@joplinapp/lib/models/Note');
const { replaceRegexDiacritics, pregQuote } = require('@joplinapp/lib/string-utils');
const markJsUtils = require('@joplin/lib/markJsUtils');
const Note = require('@joplin/lib/models/Note');
const { replaceRegexDiacritics, pregQuote } = require('@joplin/lib/string-utils');
const styled = require('styled-components').default;
const StyledRoot = styled.div`

10
packages/app-desktop/gui/NotePropertiesDialog.jsx
View File

@@ -1,13 +1,13 @@
const React = require('react');
const { _ } = require('@joplinapp/lib/locale');
const { themeStyle } = require('@joplinapp/lib/theme');
const time = require('@joplinapp/lib/time').default;
const { _ } = require('@joplin/lib/locale');
const { themeStyle } = require('@joplin/lib/theme');
const time = require('@joplin/lib/time').default;
const DialogButtonRow = require('./DialogButtonRow.min');
const Datetime = require('react-datetime');
const Note = require('@joplinapp/lib/models/Note');
const Note = require('@joplin/lib/models/Note');
const formatcoords = require('formatcoords');
const bridge = require('electron').remote.require('./bridge').default;
const shim = require('@joplinapp/lib/shim').default;
const shim = require('@joplin/lib/shim').default;
class NotePropertiesDialog extends React.Component {
constructor() {

24
packages/app-desktop/gui/NoteRevisionViewer.jsx
View File

@@ -1,21 +1,21 @@
const React = require('react');
const { connect } = require('react-redux');
const { themeStyle } = require('@joplinapp/lib/theme');
const { _ } = require('@joplinapp/lib/locale');
const { themeStyle } = require('@joplin/lib/theme');
const { _ } = require('@joplin/lib/locale');
const NoteTextViewer = require('./NoteTextViewer').default;
const HelpButton = require('./HelpButton.min');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Revision = require('@joplinapp/lib/models/Revision');
const urlUtils = require('@joplinapp/lib/urlUtils');
const Setting = require('@joplinapp/lib/models/Setting').default;
const RevisionService = require('@joplinapp/lib/services/RevisionService');
const shared = require('@joplinapp/lib/components/shared/note-screen-shared.js');
const { MarkupToHtml } = require('@joplinapp/renderer');
const time = require('@joplinapp/lib/time').default;
const BaseModel = require('@joplin/lib/BaseModel').default;
const Revision = require('@joplin/lib/models/Revision');
const urlUtils = require('@joplin/lib/urlUtils');
const Setting = require('@joplin/lib/models/Setting').default;
const RevisionService = require('@joplin/lib/services/RevisionService');
const shared = require('@joplin/lib/components/shared/note-screen-shared.js');
const { MarkupToHtml } = require('@joplin/renderer');
const time = require('@joplin/lib/time').default;
const ReactTooltip = require('react-tooltip');
const { urlDecode, substrWithEllipsis } = require('@joplinapp/lib/string-utils');
const { urlDecode, substrWithEllipsis } = require('@joplin/lib/string-utils');
const bridge = require('electron').remote.require('./bridge').default;
const markupLanguageUtils = require('@joplinapp/lib/markupLanguageUtils').default;
const markupLanguageUtils = require('@joplin/lib/markupLanguageUtils').default;
class NoteRevisionViewerComponent extends React.PureComponent {
constructor() {

4
packages/app-desktop/gui/NoteSearchBar.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react');
const { connect } = require('react-redux');
const { themeStyle } = require('@joplinapp/lib/theme');
const { _ } = require('@joplinapp/lib/locale');
const { themeStyle } = require('@joplin/lib/theme');
const { _ } = require('@joplin/lib/locale');
class NoteSearchBarComponent extends React.Component {
constructor() {

4
packages/app-desktop/gui/NoteStatusBar.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react');
const { connect } = require('react-redux');
const time = require('@joplinapp/lib/time').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const time = require('@joplin/lib/time').default;
const { themeStyle } = require('@joplin/lib/theme');
class NoteStatusBarComponent extends React.Component {
style() {

2
packages/app-desktop/gui/NoteTextViewer.tsx
View File

@@ -1,6 +1,6 @@
import * as React from 'react';
const { connect } = require('react-redux');
const { reg } = require('@joplinapp/lib/registry.js');
const { reg } = require('@joplin/lib/registry.js');
interface Props {
onDomReady: Function,

10
packages/app-desktop/gui/NoteToolbar/NoteToolbar.tsx
View File

@@ -1,11 +1,11 @@
import * as React from 'react';
import CommandService from '@joplinapp/lib/services/CommandService';
import CommandService from '@joplin/lib/services/CommandService';
import ToolbarBase from '../ToolbarBase';
import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer';
import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext';
import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext';
const { connect } = require('react-redux');
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
interface NoteToolbarProps {
themeId: number,

10
packages/app-desktop/gui/OneDriveLoginScreen.tsx
View File

@@ -1,13 +1,13 @@
import * as React from 'react';
import ButtonBar from './ConfigScreen/ButtonBar';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const { connect } = require('react-redux');
const { reg } = require('@joplinapp/lib/registry.js');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { reg } = require('@joplin/lib/registry.js');
const Setting = require('@joplin/lib/models/Setting').default;
const bridge = require('electron').remote.require('./bridge').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const { OneDriveApiNodeUtils } = require('@joplinapp/lib/onedrive-api-node-utils.js');
const { themeStyle } = require('@joplin/lib/theme');
const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js');
interface Props {
themeId: string,

6
packages/app-desktop/gui/PromptDialog.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react');
const { _ } = require('@joplinapp/lib/locale');
const { themeStyle } = require('@joplinapp/lib/theme');
const time = require('@joplinapp/lib/time').default;
const { _ } = require('@joplin/lib/locale');
const { themeStyle } = require('@joplin/lib/theme');
const time = require('@joplin/lib/time').default;
const Datetime = require('react-datetime');
const CreatableSelect = require('react-select/lib/Creatable').default;
const Select = require('react-select').default;

6
packages/app-desktop/gui/ResourceScreen.tsx
View File

@@ -1,12 +1,12 @@
import * as React from 'react';
import ButtonBar from './ConfigScreen/ButtonBar';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const { connect } = require('react-redux');
const { themeStyle } = require('@joplinapp/lib/theme');
const { themeStyle } = require('@joplin/lib/theme');
const bridge = require('electron').remote.require('./bridge').default;
const prettyBytes = require('pretty-bytes');
const Resource = require('@joplinapp/lib/models/Resource.js');
const Resource = require('@joplin/lib/models/Resource.js');
interface Style {
width: number

10
packages/app-desktop/gui/Root.tsx
View File

@@ -5,21 +5,21 @@ import StatusScreen from './StatusScreen/StatusScreen';
import OneDriveLoginScreen from './OneDriveLoginScreen';
import DropboxLoginScreen from './DropboxLoginScreen';
import ErrorBoundary from './ErrorBoundary';
import { themeStyle } from '@joplinapp/lib/theme';
import { themeStyle } from '@joplin/lib/theme';
import { Size } from './ResizableLayout/ResizableLayout';
import MenuBar from './MenuBar';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const React = require('react');
const { render } = require('react-dom');
const { connect, Provider } = require('react-redux');
const Setting = require('@joplinapp/lib/models/Setting').default;
const shim = require('@joplinapp/lib/shim').default;
const Setting = require('@joplin/lib/models/Setting').default;
const shim = require('@joplin/lib/shim').default;
shim.setReact(React);
const { ImportScreen } = require('./ImportScreen.min.js');
const { ResourceScreen } = require('./ResourceScreen.js');
const { Navigator } = require('./Navigator.min.js');
const WelcomeUtils = require('@joplinapp/lib/WelcomeUtils');
const WelcomeUtils = require('@joplin/lib/WelcomeUtils');
const { ThemeProvider, StyleSheetManager, createGlobalStyle } = require('styled-components');
const bridge = require('electron').remote.require('./bridge').default;

4
packages/app-desktop/gui/Root_UpgradeSyncTarget.tsx
View File

@@ -1,10 +1,10 @@
import * as React from 'react';
import { useEffect } from 'react';
import useSyncTargetUpgrade, { SyncTargetUpgradeResult } from '@joplinapp/lib/services/synchronizer/gui/useSyncTargetUpgrade';
import useSyncTargetUpgrade, { SyncTargetUpgradeResult } from '@joplin/lib/services/synchronizer/gui/useSyncTargetUpgrade';
const { render } = require('react-dom');
const ipcRenderer = require('electron').ipcRenderer;
const Setting = require('@joplinapp/lib/models/Setting').default;
const Setting = require('@joplin/lib/models/Setting').default;
const bridge = require('electron').remote.require('./bridge').default;
function useAppCloseHandler(upgradeResult:SyncTargetUpgradeResult) {

4
packages/app-desktop/gui/SearchBar/SearchBar.tsx
View File

@@ -1,10 +1,10 @@
import * as React from 'react';
import { useState, useCallback, useEffect } from 'react';
import CommandService from '@joplinapp/lib/services/CommandService';
import CommandService from '@joplin/lib/services/CommandService';
import useSearch from './hooks/useSearch';
import { Root, SearchInput, SearchButton, SearchButtonIcon } from './styles';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const { connect } = require('react-redux');
interface Props {

2
packages/app-desktop/gui/SearchBar/hooks/useSearch.ts
View File

@@ -1,5 +1,5 @@
import { useEffect } from 'react';
import CommandService from '@joplinapp/lib/services/CommandService';
import CommandService from '@joplin/lib/services/CommandService';
const debounce = require('debounce');
export default function useSearch(query:string) {

14
packages/app-desktop/gui/ShareNoteDialog.tsx
View File

@@ -1,14 +1,14 @@
import * as React from 'react';
import { useState, useEffect } from 'react';
import JoplinServerApi from '@joplinapp/lib/JoplinServerApi';
import JoplinServerApi from '@joplin/lib/JoplinServerApi';
import { _, _n } from '@joplinapp/lib/locale';
const { themeStyle, buildStyle } = require('@joplinapp/lib/theme');
import { _, _n } from '@joplin/lib/locale';
const { themeStyle, buildStyle } = require('@joplin/lib/theme');
const DialogButtonRow = require('./DialogButtonRow.min');
const Note = require('@joplinapp/lib/models/Note');
const Setting = require('@joplinapp/lib/models/Setting').default;
const BaseItem = require('@joplinapp/lib/models/BaseItem');
const { reg } = require('@joplinapp/lib/registry.js');
const Note = require('@joplin/lib/models/Note');
const Setting = require('@joplin/lib/models/Setting').default;
const BaseItem = require('@joplin/lib/models/BaseItem');
const { reg } = require('@joplin/lib/registry.js');
const { clipboard } = require('electron');
interface ShareNoteDialogProps {

28
packages/app-desktop/gui/SideBar/SideBar.tsx
View File

@@ -1,26 +1,26 @@
import * as React from 'react';
import { StyledRoot, StyledAddButton, StyledHeader, StyledHeaderIcon, StyledAllNotesIcon, StyledHeaderLabel, StyledListItem, StyledListItemAnchor, StyledExpandLink, StyledNoteCount, StyledSyncReportText, StyledSyncReport, StyledSynchronizeButton } from './styles';
import { ButtonLevel } from '../Button/Button';
import CommandService from '@joplinapp/lib/services/CommandService';
import InteropService from '@joplinapp/lib/services/interop/InteropService';
import Synchronizer from '@joplinapp/lib/Synchronizer';
import Setting from '@joplinapp/lib/models/Setting';
import MenuUtils from '@joplinapp/lib/services/commands/MenuUtils';
import CommandService from '@joplin/lib/services/CommandService';
import InteropService from '@joplin/lib/services/interop/InteropService';
import Synchronizer from '@joplin/lib/Synchronizer';
import Setting from '@joplin/lib/models/Setting';
import MenuUtils from '@joplin/lib/services/commands/MenuUtils';
import InteropServiceHelper from '../../InteropServiceHelper';
import { _ } from '@joplinapp/lib/locale';
import { _ } from '@joplin/lib/locale';
const { connect } = require('react-redux');
const shared = require('@joplinapp/lib/components/shared/side-menu-shared.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Folder = require('@joplinapp/lib/models/Folder.js');
const Note = require('@joplinapp/lib/models/Note.js');
const Tag = require('@joplinapp/lib/models/Tag.js');
const { themeStyle } = require('@joplinapp/lib/theme');
const shared = require('@joplin/lib/components/shared/side-menu-shared.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Folder = require('@joplin/lib/models/Folder.js');
const Note = require('@joplin/lib/models/Note.js');
const Tag = require('@joplin/lib/models/Tag.js');
const { themeStyle } = require('@joplin/lib/theme');
const bridge = require('electron').remote.require('./bridge').default;
const Menu = bridge().Menu;
const MenuItem = bridge().MenuItem;
const { substrWithEllipsis } = require('@joplinapp/lib/string-utils');
const { ALL_NOTES_FILTER_ID } = require('@joplinapp/lib/reserved-ids');
const { substrWithEllipsis } = require('@joplin/lib/string-utils');
const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids');
interface Props {
themeId: number,

4
packages/app-desktop/gui/SideBar/commands/focusElementSideBar.ts
View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'focusElementSideBar',

Some files were not shown because too many files have changed in this diff Show More