From af597d943bd1128e741d530ef4b1d0ebaf8d3b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Wed, 14 Apr 2021 10:15:44 +0300
Subject: [PATCH] Move js-tree files out from /containers subfolder

---
 chrome/content/zotero/advancedSearch.js                    | 4 ++--
 chrome/content/zotero/{containers => }/collectionTree.jsx  | 2 +-
 chrome/content/zotero/components/form/input.jsx            | 2 +-
 chrome/content/zotero/fileInterface.js                     | 2 +-
 chrome/content/zotero/import/importWizard.js               | 2 +-
 chrome/content/zotero/{containers => }/itemTree.jsx        | 4 ++--
 chrome/content/zotero/{containers => }/itemTreeColumns.jsx | 0
 chrome/content/zotero/{containers => }/libraryTree.js      | 0
 chrome/content/zotero/preferences/preferences_advanced.js  | 2 +-
 chrome/content/zotero/preferences/preferences_cite.jsx     | 2 +-
 chrome/content/zotero/preferences/preferences_general.js   | 2 +-
 chrome/content/zotero/rtfScan.jsx                          | 2 +-
 chrome/content/zotero/selectItemsDialog.js                 | 4 ++--
 chrome/content/zotero/tools/build_typeSchemaData.html      | 2 +-
 chrome/content/zotero/tools/csledit.js                     | 2 +-
 chrome/content/zotero/xpcom/dataDirectory.js               | 2 +-
 chrome/content/zotero/zoteroPane.js                        | 6 +++---
 resource/require.js                                        | 3 +--
 18 files changed, 21 insertions(+), 22 deletions(-)
 rename chrome/content/zotero/{containers => }/collectionTree.jsx (99%)
 rename chrome/content/zotero/{containers => }/itemTree.jsx (99%)
 rename chrome/content/zotero/{containers => }/itemTreeColumns.jsx (100%)
 rename chrome/content/zotero/{containers => }/libraryTree.js (100%)

diff --git a/chrome/content/zotero/advancedSearch.js b/chrome/content/zotero/advancedSearch.js
index efacc96a50..ff0868c592 100644
--- a/chrome/content/zotero/advancedSearch.js
+++ b/chrome/content/zotero/advancedSearch.js
@@ -25,8 +25,8 @@
 
 
 Components.utils.import("resource://gre/modules/Services.jsm");
-import ItemTree from 'containers/itemTree';
-import { getDefaultColumnsByDataKeys } from 'containers/itemTreeColumns';
+import ItemTree from 'zotero/itemTree';
+import { getDefaultColumnsByDataKeys } from 'zotero/itemTreeColumns';
 
 
 var ZoteroAdvancedSearch = new function() {
diff --git a/chrome/content/zotero/containers/collectionTree.jsx b/chrome/content/zotero/collectionTree.jsx
similarity index 99%
rename from chrome/content/zotero/containers/collectionTree.jsx
rename to chrome/content/zotero/collectionTree.jsx
index 32e08333f7..ea31481b4b 100644
--- a/chrome/content/zotero/containers/collectionTree.jsx
+++ b/chrome/content/zotero/collectionTree.jsx
@@ -26,7 +26,7 @@
 const React = require('react');
 const ReactDOM = require('react-dom');
 const { IntlProvider } = require('react-intl');
-const LibraryTree = require('containers/libraryTree');
+const LibraryTree = require('./libraryTree');
 const VirtualizedTable = require('components/virtualized-table');
 const { TreeSelectionStub } = VirtualizedTable;
 const Icons = require('components/icons');
diff --git a/chrome/content/zotero/components/form/input.jsx b/chrome/content/zotero/components/form/input.jsx
index 6065a5a75f..fb6da1959b 100644
--- a/chrome/content/zotero/components/form/input.jsx
+++ b/chrome/content/zotero/components/form/input.jsx
@@ -27,7 +27,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { noop } from '../utils';
-import { pickKeys } from '@zotero/immutable';
+import { pickKeys } from 'zotero/modules/immutable';
 //import AutoResizer from './auto-resizer';
 import Autosuggest from 'react-autosuggest';
 
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
index 534b6527e0..933668e18e 100644
--- a/chrome/content/zotero/fileInterface.js
+++ b/chrome/content/zotero/fileInterface.js
@@ -25,7 +25,7 @@
 
 Components.utils.import("resource://gre/modules/osfile.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 /****Zotero_File_Exporter****
  **
diff --git a/chrome/content/zotero/import/importWizard.js b/chrome/content/zotero/import/importWizard.js
index 77018b029c..9d3fad9c2b 100644
--- a/chrome/content/zotero/import/importWizard.js
+++ b/chrome/content/zotero/import/importWizard.js
@@ -1,4 +1,4 @@
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 var Zotero_Import_Wizard = {
 	_wizard: null,
diff --git a/chrome/content/zotero/containers/itemTree.jsx b/chrome/content/zotero/itemTree.jsx
similarity index 99%
rename from chrome/content/zotero/containers/itemTree.jsx
rename to chrome/content/zotero/itemTree.jsx
index e601d7b571..b644e3cb61 100644
--- a/chrome/content/zotero/containers/itemTree.jsx
+++ b/chrome/content/zotero/itemTree.jsx
@@ -28,12 +28,12 @@ const PropTypes = require("prop-types");
 const React = require('react');
 const ReactDOM = require('react-dom');
 const { IntlProvider } = require('react-intl');
-const LibraryTree = require('containers/libraryTree');
+const LibraryTree = require('./libraryTree');
 const VirtualizedTable = require('components/virtualized-table');
 const { renderCell, TreeSelectionStub } = VirtualizedTable;
 const Icons = require('components/icons');
 const { getDOMElement } = Icons;
-const { COLUMNS } = require('containers/itemTreeColumns');
+const { COLUMNS } = require('./itemTreeColumns');
 const { Cc, Ci, Cu } = require('chrome');
 Cu.import("resource://gre/modules/osfile.jsm");
 
diff --git a/chrome/content/zotero/containers/itemTreeColumns.jsx b/chrome/content/zotero/itemTreeColumns.jsx
similarity index 100%
rename from chrome/content/zotero/containers/itemTreeColumns.jsx
rename to chrome/content/zotero/itemTreeColumns.jsx
diff --git a/chrome/content/zotero/containers/libraryTree.js b/chrome/content/zotero/libraryTree.js
similarity index 100%
rename from chrome/content/zotero/containers/libraryTree.js
rename to chrome/content/zotero/libraryTree.js
diff --git a/chrome/content/zotero/preferences/preferences_advanced.js b/chrome/content/zotero/preferences/preferences_advanced.js
index b3f32d97ca..84940319f1 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.js
+++ b/chrome/content/zotero/preferences/preferences_advanced.js
@@ -24,7 +24,7 @@
 */
 
 Components.utils.import("resource://gre/modules/Services.jsm");
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 Zotero_Preferences.Advanced = {
 	DEFAULT_OPENURL_RESOLVER: 'https://www.worldcat.org/registry/gateway',
diff --git a/chrome/content/zotero/preferences/preferences_cite.jsx b/chrome/content/zotero/preferences/preferences_cite.jsx
index 337ded38a8..745eb66745 100644
--- a/chrome/content/zotero/preferences/preferences_cite.jsx
+++ b/chrome/content/zotero/preferences/preferences_cite.jsx
@@ -25,7 +25,7 @@
 
 "use strict";
 
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 var React = require('react');
 var ReactDOM = require('react-dom');
diff --git a/chrome/content/zotero/preferences/preferences_general.js b/chrome/content/zotero/preferences/preferences_general.js
index 366fb43f7e..2d851ffe90 100644
--- a/chrome/content/zotero/preferences/preferences_general.js
+++ b/chrome/content/zotero/preferences/preferences_general.js
@@ -27,7 +27,7 @@
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/osfile.jsm");
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 Zotero_Preferences.General = {
 	init: function () {
diff --git a/chrome/content/zotero/rtfScan.jsx b/chrome/content/zotero/rtfScan.jsx
index d58edfe615..f9f4164a92 100644
--- a/chrome/content/zotero/rtfScan.jsx
+++ b/chrome/content/zotero/rtfScan.jsx
@@ -27,7 +27,7 @@
  * @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 ReactDOM from 'react-dom';
 import VirtualizedTable from 'components/virtualized-table';
diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js
index abbfe0b341..43a2593943 100644
--- a/chrome/content/zotero/selectItemsDialog.js
+++ b/chrome/content/zotero/selectItemsDialog.js
@@ -23,8 +23,8 @@
     ***** END LICENSE BLOCK *****
 */
 
-import CollectionTree from 'containers/collectionTree';
-import ItemTree from 'containers/itemTree';
+import CollectionTree from 'zotero/collectionTree';
+import ItemTree from 'zotero/itemTree';
 
 var itemsView;
 var collectionsView;
diff --git a/chrome/content/zotero/tools/build_typeSchemaData.html b/chrome/content/zotero/tools/build_typeSchemaData.html
index b75652d460..8821b1c24f 100644
--- a/chrome/content/zotero/tools/build_typeSchemaData.html
+++ b/chrome/content/zotero/tools/build_typeSchemaData.html
@@ -7,7 +7,7 @@
 <p id="result"></p>
 <script src="../include.js"></script>
 <script type="text/javascript">
-	import FilePicker from 'zotero/filePicker';
+	import FilePicker from 'zotero/modules/filePicker';
 	
 	(async function () {
 		// Create schema
diff --git a/chrome/content/zotero/tools/csledit.js b/chrome/content/zotero/tools/csledit.js
index 84779836f8..b787d46b2e 100644
--- a/chrome/content/zotero/tools/csledit.js
+++ b/chrome/content/zotero/tools/csledit.js
@@ -23,7 +23,7 @@
     ***** END LICENSE BLOCK *****
 */
 
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 var Zotero_CSL_Editor = new function() {
 	this.init = init;
diff --git a/chrome/content/zotero/xpcom/dataDirectory.js b/chrome/content/zotero/xpcom/dataDirectory.js
index 2724db9d3c..7847d8dff3 100644
--- a/chrome/content/zotero/xpcom/dataDirectory.js
+++ b/chrome/content/zotero/xpcom/dataDirectory.js
@@ -25,7 +25,7 @@
 
 "use strict";
 
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 Zotero.DataDirectory = {
 	MIGRATION_MARKER: 'migrate-dir',
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 6538f81e47..8e58d25c3d 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -23,7 +23,7 @@
     ***** END LICENSE BLOCK *****
 */
 
-import FilePicker from 'zotero/filePicker';
+import FilePicker from 'zotero/modules/filePicker';
 
 /*
  * This object contains the various functions for the interface
@@ -1049,7 +1049,7 @@ var ZoteroPane = new function()
 
 	this.initItemsTree = async function () {
 		try {
-			const ItemTree = require('containers/itemTree');
+			const ItemTree = require('zotero/itemTree');
 			var itemsTree = document.getElementById('zotero-items-tree');
 			ZoteroPane.itemsView = await ItemTree.init(itemsTree, {
 				id: "main",
@@ -1072,7 +1072,7 @@ var ZoteroPane = new function()
 
 	this.initCollectionsTree = async function () {
 		try {
-			const CollectionTree = require('containers/collectionTree');
+			const CollectionTree = require('zotero/collectionTree');
 			var collectionsTree = document.getElementById('zotero-collections-tree');
 			ZoteroPane.collectionsView = await CollectionTree.init(collectionsTree, {
 				onSelectionChange: prevSelection => ZoteroPane.onCollectionSelected(prevSelection),
diff --git a/resource/require.js b/resource/require.js
index f58d522f49..6389588aad 100644
--- a/resource/require.js
+++ b/resource/require.js
@@ -99,8 +99,7 @@ var require = (function() {
 			'': 'resource://zotero/',
 			'containers/': 'chrome://zotero/content/containers/',
 			'components/': 'chrome://zotero/content/components/',
-			'zotero/': 'chrome://zotero/content/modules/',
-			'@zotero/': 'chrome://zotero/content/modules/'
+			'zotero/': 'chrome://zotero/content/',
 		},
 		globals
 	});