mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move js-tree files out from /containers subfolder

Browse source
This commit is contained in:
Adomas Venčkauskas 2021-04-14 10:15:44 +03:00 committed by Dan Stillman
parent e68685521b
commit af597d943b
18 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/advancedSearch.js
View file

@ -25,8 +25,8 @@
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
import ItemTree from 'containers/itemTree'; import ItemTree from 'zotero/itemTree';
import { getDefaultColumnsByDataKeys } from 'containers/itemTreeColumns'; import { getDefaultColumnsByDataKeys } from 'zotero/itemTreeColumns';
var ZoteroAdvancedSearch = new function() { var ZoteroAdvancedSearch = new function() {

2
chrome/content/zotero/containers/collectionTree.jsx → chrome/content/zotero/collectionTree.jsx
View file

@ -26,7 +26,7 @@
const React = require('react'); const React = require('react');
const ReactDOM = require('react-dom'); const ReactDOM = require('react-dom');
const { IntlProvider } = require('react-intl'); const { IntlProvider } = require('react-intl');
const LibraryTree = require('containers/libraryTree'); const LibraryTree = require('./libraryTree');
const VirtualizedTable = require('components/virtualized-table'); const VirtualizedTable = require('components/virtualized-table');
const { TreeSelectionStub } = VirtualizedTable; const { TreeSelectionStub } = VirtualizedTable;
const Icons = require('components/icons'); const Icons = require('components/icons');

2
chrome/content/zotero/components/form/input.jsx
View file

@ -27,7 +27,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import cx from 'classnames'; import cx from 'classnames';
import { noop } from '../utils'; import { noop } from '../utils';
import { pickKeys } from '@zotero/immutable'; import { pickKeys } from 'zotero/modules/immutable';
//import AutoResizer from './auto-resizer'; //import AutoResizer from './auto-resizer';
import Autosuggest from 'react-autosuggest'; import Autosuggest from 'react-autosuggest';

2
chrome/content/zotero/fileInterface.js
View file

@ -25,7 +25,7 @@
Components.utils.import("resource://gre/modules/osfile.jsm"); Components.utils.import("resource://gre/modules/osfile.jsm");
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
/****Zotero_File_Exporter**** /****Zotero_File_Exporter****
** **

2
chrome/content/zotero/import/importWizard.js
View file

@ -1,4 +1,4 @@
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
var Zotero_Import_Wizard = { var Zotero_Import_Wizard = {
_wizard: null, _wizard: null,

4
chrome/content/zotero/containers/itemTree.jsx → chrome/content/zotero/itemTree.jsx
View file

@ -28,12 +28,12 @@ const PropTypes = require("prop-types");
const React = require('react'); const React = require('react');
const ReactDOM = require('react-dom'); const ReactDOM = require('react-dom');
const { IntlProvider } = require('react-intl'); const { IntlProvider } = require('react-intl');
const LibraryTree = require('containers/libraryTree'); const LibraryTree = require('./libraryTree');
const VirtualizedTable = require('components/virtualized-table'); const VirtualizedTable = require('components/virtualized-table');
const { renderCell, TreeSelectionStub } = VirtualizedTable; const { renderCell, TreeSelectionStub } = VirtualizedTable;
const Icons = require('components/icons'); const Icons = require('components/icons');
const { getDOMElement } = Icons; const { getDOMElement } = Icons;
const { COLUMNS } = require('containers/itemTreeColumns'); const { COLUMNS } = require('./itemTreeColumns');
const { Cc, Ci, Cu } = require('chrome'); const { Cc, Ci, Cu } = require('chrome');
Cu.import("resource://gre/modules/osfile.jsm"); Cu.import("resource://gre/modules/osfile.jsm");

0
chrome/content/zotero/containers/itemTreeColumns.jsx → chrome/content/zotero/itemTreeColumns.jsx
View file

0
chrome/content/zotero/containers/libraryTree.js → chrome/content/zotero/libraryTree.js
View file

2
chrome/content/zotero/preferences/preferences_advanced.js
View file

@ -24,7 +24,7 @@
*/ */
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
Zotero_Preferences.Advanced = { Zotero_Preferences.Advanced = {
DEFAULT_OPENURL_RESOLVER: 'https://www.worldcat.org/registry/gateway', DEFAULT_OPENURL_RESOLVER: 'https://www.worldcat.org/registry/gateway',

2
chrome/content/zotero/preferences/preferences_cite.jsx
View file

@ -25,7 +25,7 @@
"use strict"; "use strict";
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
var React = require('react'); var React = require('react');
var ReactDOM = require('react-dom'); var ReactDOM = require('react-dom');

2
chrome/content/zotero/preferences/preferences_general.js
View file

@ -27,7 +27,7 @@
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/osfile.jsm"); Components.utils.import("resource://gre/modules/osfile.jsm");
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
Zotero_Preferences.General = { Zotero_Preferences.General = {
init: function () { init: function () {

2
chrome/content/zotero/rtfScan.jsx
View file

@ -27,7 +27,7 @@
* @fileOverview Tools for automatically retrieving a citation for the given PDF * @fileOverview Tools for automatically retrieving a citation for the given PDF
*/ */
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import VirtualizedTable from 'components/virtualized-table'; import VirtualizedTable from 'components/virtualized-table';

4
chrome/content/zotero/selectItemsDialog.js
View file

@ -23,8 +23,8 @@
***** END LICENSE BLOCK ***** ***** END LICENSE BLOCK *****
*/ */
import CollectionTree from 'containers/collectionTree'; import CollectionTree from 'zotero/collectionTree';
import ItemTree from 'containers/itemTree'; import ItemTree from 'zotero/itemTree';
var itemsView; var itemsView;
var collectionsView; var collectionsView;

2
chrome/content/zotero/tools/build_typeSchemaData.html
View file

@ -7,7 +7,7 @@
<p id="result"></p> <p id="result"></p>
<script src="../include.js"></script> <script src="../include.js"></script>
<script type="text/javascript"> <script type="text/javascript">
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
(async function () { (async function () {
// Create schema // Create schema

2
chrome/content/zotero/tools/csledit.js
View file

@ -23,7 +23,7 @@
***** END LICENSE BLOCK ***** ***** END LICENSE BLOCK *****
*/ */
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
var Zotero_CSL_Editor = new function() { var Zotero_CSL_Editor = new function() {
this.init = init; this.init = init;

2
chrome/content/zotero/xpcom/dataDirectory.js
View file

@ -25,7 +25,7 @@
"use strict"; "use strict";
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
Zotero.DataDirectory = { Zotero.DataDirectory = {
MIGRATION_MARKER: 'migrate-dir', MIGRATION_MARKER: 'migrate-dir',

6
chrome/content/zotero/zoteroPane.js
View file

@ -23,7 +23,7 @@
***** END LICENSE BLOCK ***** ***** END LICENSE BLOCK *****
*/ */
import FilePicker from 'zotero/filePicker'; import FilePicker from 'zotero/modules/filePicker';
/* /*
* This object contains the various functions for the interface * This object contains the various functions for the interface
@ -1049,7 +1049,7 @@ var ZoteroPane = new function()
this.initItemsTree = async function () { this.initItemsTree = async function () {
try { try {
const ItemTree = require('containers/itemTree'); const ItemTree = require('zotero/itemTree');
var itemsTree = document.getElementById('zotero-items-tree'); var itemsTree = document.getElementById('zotero-items-tree');
ZoteroPane.itemsView = await ItemTree.init(itemsTree, { ZoteroPane.itemsView = await ItemTree.init(itemsTree, {
id: "main", id: "main",
@ -1072,7 +1072,7 @@ var ZoteroPane = new function()
this.initCollectionsTree = async function () { this.initCollectionsTree = async function () {
try { try {
const CollectionTree = require('containers/collectionTree'); const CollectionTree = require('zotero/collectionTree');
var collectionsTree = document.getElementById('zotero-collections-tree'); var collectionsTree = document.getElementById('zotero-collections-tree');
ZoteroPane.collectionsView = await CollectionTree.init(collectionsTree, { ZoteroPane.collectionsView = await CollectionTree.init(collectionsTree, {
onSelectionChange: prevSelection => ZoteroPane.onCollectionSelected(prevSelection), onSelectionChange: prevSelection => ZoteroPane.onCollectionSelected(prevSelection),

3
resource/require.js
View file

@ -99,8 +99,7 @@ var require = (function() {
'': 'resource://zotero/', '': 'resource://zotero/',
'containers/': 'chrome://zotero/content/containers/', 'containers/': 'chrome://zotero/content/containers/',
'components/': 'chrome://zotero/content/components/', 'components/': 'chrome://zotero/content/components/',
'zotero/': 'chrome://zotero/content/modules/', 'zotero/': 'chrome://zotero/content/',
'@zotero/': 'chrome://zotero/content/modules/'
}, },
globals globals
}); });