diff options
author | bob <bcz@cs.brown.edu> | 2020-01-08 12:19:28 -0500 |
---|---|---|
committer | bob <bcz@cs.brown.edu> | 2020-01-08 12:19:28 -0500 |
commit | 1b68d5a89abdd8a7db4d4762a3ee44c3363e9a74 (patch) | |
tree | 8308876ffb2c6e41d74e403fd3532a35107fadc4 | |
parent | 7d6dd8470384d345771ed67c88c9b15e2b333a6b (diff) |
cleaned up searchBox. fixed parentdocument context menu placement.
135 files changed, 112 insertions, 131 deletions
diff --git a/solr-8.3.1/server/solr/dash/core.properties b/solr-8.3.1/server/solr/dash/core.properties new file mode 100644 index 000000000..0912a8303 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/core.properties @@ -0,0 +1,6 @@ +#Written by CorePropertiesLocator +#Wed Jan 08 14:44:34 UTC 2020 +name=dash +config=solrconfig.xml +schema=schema.xml +dataDir=data diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.dii b/solr-8.3.1/server/solr/dash/data/index/_hs.dii Binary files differnew file mode 100644 index 000000000..c2207a7b5 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.dim b/solr-8.3.1/server/solr/dash/data/index/_hs.dim Binary files differnew file mode 100644 index 000000000..808fdf537 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.fdt b/solr-8.3.1/server/solr/dash/data/index/_hs.fdt Binary files differnew file mode 100644 index 000000000..54fb57b98 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.fdx b/solr-8.3.1/server/solr/dash/data/index/_hs.fdx Binary files differnew file mode 100644 index 000000000..02a54c916 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.fnm b/solr-8.3.1/server/solr/dash/data/index/_hs.fnm Binary files differnew file mode 100644 index 000000000..2bb9517ac --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.nvd b/solr-8.3.1/server/solr/dash/data/index/_hs.nvd Binary files differnew file mode 100644 index 000000000..994cb90ad --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.nvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.nvm b/solr-8.3.1/server/solr/dash/data/index/_hs.nvm Binary files differnew file mode 100644 index 000000000..a452ff4f2 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.nvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs.si b/solr-8.3.1/server/solr/dash/data/index/_hs.si Binary files differnew file mode 100644 index 000000000..eeb2bc77e --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_1.liv b/solr-8.3.1/server/solr/dash/data/index/_hs_1.liv Binary files differnew file mode 100644 index 000000000..9e1e90cb8 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs_1.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..3f3c7dffa --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.pos Binary files differnew file mode 100644 index 000000000..9f2d9f805 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.pos diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..1fb544956 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..9c97fbbf2 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..e566bb7ed --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..722d76cf9 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_hs_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.dii b/solr-8.3.1/server/solr/dash/data/index/_j7.dii Binary files differnew file mode 100644 index 000000000..7d4c5af95 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.dim b/solr-8.3.1/server/solr/dash/data/index/_j7.dim Binary files differnew file mode 100644 index 000000000..c6101943f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.fdt b/solr-8.3.1/server/solr/dash/data/index/_j7.fdt Binary files differnew file mode 100644 index 000000000..e89db4ed5 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.fdx b/solr-8.3.1/server/solr/dash/data/index/_j7.fdx Binary files differnew file mode 100644 index 000000000..a589f2dcd --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.fnm b/solr-8.3.1/server/solr/dash/data/index/_j7.fnm Binary files differnew file mode 100644 index 000000000..78d59368b --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.nvd b/solr-8.3.1/server/solr/dash/data/index/_j7.nvd Binary files differnew file mode 100644 index 000000000..984fb854c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.nvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.nvm b/solr-8.3.1/server/solr/dash/data/index/_j7.nvm Binary files differnew file mode 100644 index 000000000..aa478973c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.nvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7.si b/solr-8.3.1/server/solr/dash/data/index/_j7.si Binary files differnew file mode 100644 index 000000000..5ce51e20f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_1.liv b/solr-8.3.1/server/solr/dash/data/index/_j7_1.liv Binary files differnew file mode 100644 index 000000000..65e825f18 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7_1.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..3158e0d7f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.pos Binary files differnew file mode 100644 index 000000000..e5b3f12f9 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.pos diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..db0ddd7dd --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..6d06bbc8a --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..06dc34e64 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..7f69f1665 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_j7_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.dii b/solr-8.3.1/server/solr/dash/data/index/_jf.dii Binary files differnew file mode 100644 index 000000000..0627e1127 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.dim b/solr-8.3.1/server/solr/dash/data/index/_jf.dim Binary files differnew file mode 100644 index 000000000..1a489cd18 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.fdt b/solr-8.3.1/server/solr/dash/data/index/_jf.fdt Binary files differnew file mode 100644 index 000000000..5fce34b2c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.fdx b/solr-8.3.1/server/solr/dash/data/index/_jf.fdx Binary files differnew file mode 100644 index 000000000..14aaf8fc0 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.fnm b/solr-8.3.1/server/solr/dash/data/index/_jf.fnm Binary files differnew file mode 100644 index 000000000..eff2f74b7 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.nvd b/solr-8.3.1/server/solr/dash/data/index/_jf.nvd Binary files differnew file mode 100644 index 000000000..2bffbd106 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.nvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.nvm b/solr-8.3.1/server/solr/dash/data/index/_jf.nvm Binary files differnew file mode 100644 index 000000000..02a616913 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.nvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf.si b/solr-8.3.1/server/solr/dash/data/index/_jf.si Binary files differnew file mode 100644 index 000000000..b776600c1 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf_2.liv b/solr-8.3.1/server/solr/dash/data/index/_jf_2.liv Binary files differnew file mode 100644 index 000000000..49e851d49 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf_2.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..f951b0e3a --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.pos Binary files differnew file mode 100644 index 000000000..7bc297568 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.pos diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..874b3807c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..b835a3e5f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..04b2e5a6c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..b68fbf656 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jf_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.dii b/solr-8.3.1/server/solr/dash/data/index/_ji.dii Binary files differnew file mode 100644 index 000000000..fdef5b441 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.dim b/solr-8.3.1/server/solr/dash/data/index/_ji.dim Binary files differnew file mode 100644 index 000000000..2155d1932 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.fdt b/solr-8.3.1/server/solr/dash/data/index/_ji.fdt Binary files differnew file mode 100644 index 000000000..e7fdec3fb --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.fdx b/solr-8.3.1/server/solr/dash/data/index/_ji.fdx Binary files differnew file mode 100644 index 000000000..86c01bbd4 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.fnm b/solr-8.3.1/server/solr/dash/data/index/_ji.fnm Binary files differnew file mode 100644 index 000000000..d3925b485 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.nvd b/solr-8.3.1/server/solr/dash/data/index/_ji.nvd Binary files differnew file mode 100644 index 000000000..205e2b1cd --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.nvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.nvm b/solr-8.3.1/server/solr/dash/data/index/_ji.nvm Binary files differnew file mode 100644 index 000000000..21f18e60a --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.nvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji.si b/solr-8.3.1/server/solr/dash/data/index/_ji.si Binary files differnew file mode 100644 index 000000000..b7126893f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji_1.liv b/solr-8.3.1/server/solr/dash/data/index/_ji_1.liv Binary files differnew file mode 100644 index 000000000..753deb733 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji_1.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..060372c58 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.pos Binary files differnew file mode 100644 index 000000000..466c55484 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.pos diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..ca4000e9c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..a749cb1b9 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..de1318ae2 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..c273ad653 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_ji_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.dii b/solr-8.3.1/server/solr/dash/data/index/_jo.dii Binary files differnew file mode 100644 index 000000000..d621dc010 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.dim b/solr-8.3.1/server/solr/dash/data/index/_jo.dim Binary files differnew file mode 100644 index 000000000..a9d846c55 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.fdt b/solr-8.3.1/server/solr/dash/data/index/_jo.fdt Binary files differnew file mode 100644 index 000000000..69d7ce59c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.fdx b/solr-8.3.1/server/solr/dash/data/index/_jo.fdx Binary files differnew file mode 100644 index 000000000..71a73ac09 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.fnm b/solr-8.3.1/server/solr/dash/data/index/_jo.fnm Binary files differnew file mode 100644 index 000000000..b02414ef0 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.nvd b/solr-8.3.1/server/solr/dash/data/index/_jo.nvd Binary files differnew file mode 100644 index 000000000..993fa7ddc --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.nvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.nvm b/solr-8.3.1/server/solr/dash/data/index/_jo.nvm Binary files differnew file mode 100644 index 000000000..4397e5533 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.nvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.si b/solr-8.3.1/server/solr/dash/data/index/_jo.si Binary files differnew file mode 100644 index 000000000..2f0aefd63 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_1.liv b/solr-8.3.1/server/solr/dash/data/index/_jo_1.liv Binary files differnew file mode 100644 index 000000000..46316505e --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo_1.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..1cbf85053 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.pos Binary files differnew file mode 100644 index 000000000..97206ebfa --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.pos diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..d06a85746 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..fd9ff3dae --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..602ba23e7 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..1fd81041f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.dii b/solr-8.3.1/server/solr/dash/data/index/_jp.dii Binary files differnew file mode 100644 index 000000000..c39beb1bd --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.dim b/solr-8.3.1/server/solr/dash/data/index/_jp.dim Binary files differnew file mode 100644 index 000000000..87a5071d7 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.fdt b/solr-8.3.1/server/solr/dash/data/index/_jp.fdt Binary files differnew file mode 100644 index 000000000..a232efdf8 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.fdx b/solr-8.3.1/server/solr/dash/data/index/_jp.fdx Binary files differnew file mode 100644 index 000000000..0b5e95a9a --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.fnm b/solr-8.3.1/server/solr/dash/data/index/_jp.fnm Binary files differnew file mode 100644 index 000000000..c09282147 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.nvd b/solr-8.3.1/server/solr/dash/data/index/_jp.nvd Binary files differnew file mode 100644 index 000000000..12dcf3d4d --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.nvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.nvm b/solr-8.3.1/server/solr/dash/data/index/_jp.nvm Binary files differnew file mode 100644 index 000000000..4bde4b5f0 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.nvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.si b/solr-8.3.1/server/solr/dash/data/index/_jp.si Binary files differnew file mode 100644 index 000000000..40cd02b98 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_1.liv b/solr-8.3.1/server/solr/dash/data/index/_jp_1.liv Binary files differnew file mode 100644 index 000000000..be94523f4 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp_1.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..90774bb6f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.pos Binary files differnew file mode 100644 index 000000000..b4814c1f7 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.pos diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..f8a7871e1 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..c29ac6ed5 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..41afd53b9 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..527eed668 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.dii b/solr-8.3.1/server/solr/dash/data/index/_jq.dii Binary files differnew file mode 100644 index 000000000..a0a86dfd0 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.dim b/solr-8.3.1/server/solr/dash/data/index/_jq.dim Binary files differnew file mode 100644 index 000000000..e69c06061 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.fdt b/solr-8.3.1/server/solr/dash/data/index/_jq.fdt Binary files differnew file mode 100644 index 000000000..c49ed904f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.fdx b/solr-8.3.1/server/solr/dash/data/index/_jq.fdx Binary files differnew file mode 100644 index 000000000..85d62a39c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.fnm b/solr-8.3.1/server/solr/dash/data/index/_jq.fnm Binary files differnew file mode 100644 index 000000000..b3aa23794 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.nvd b/solr-8.3.1/server/solr/dash/data/index/_jq.nvd Binary files differnew file mode 100644 index 000000000..fb74de020 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.nvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.nvm b/solr-8.3.1/server/solr/dash/data/index/_jq.nvm Binary files differnew file mode 100644 index 000000000..b407b1b63 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.nvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.si b/solr-8.3.1/server/solr/dash/data/index/_jq.si Binary files differnew file mode 100644 index 000000000..cdf2673ca --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_2.liv b/solr-8.3.1/server/solr/dash/data/index/_jq_2.liv Binary files differnew file mode 100644 index 000000000..0ae2a2dc3 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq_2.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..91ae597e1 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.pos Binary files differnew file mode 100644 index 000000000..047dd7ae9 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.pos diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..352a6b592 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..ca0b2688d --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..7a5fbcef3 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..228fc7b0a --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.dii b/solr-8.3.1/server/solr/dash/data/index/_jr.dii Binary files differnew file mode 100644 index 000000000..7bec10455 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr.dii diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.dim b/solr-8.3.1/server/solr/dash/data/index/_jr.dim Binary files differnew file mode 100644 index 000000000..cdf02c5fb --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr.dim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.fdt b/solr-8.3.1/server/solr/dash/data/index/_jr.fdt Binary files differnew file mode 100644 index 000000000..183dda424 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr.fdt diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.fdx b/solr-8.3.1/server/solr/dash/data/index/_jr.fdx Binary files differnew file mode 100644 index 000000000..96942bc74 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr.fdx diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.fnm b/solr-8.3.1/server/solr/dash/data/index/_jr.fnm Binary files differnew file mode 100644 index 000000000..34731760f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr.fnm diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.si b/solr-8.3.1/server/solr/dash/data/index/_jr.si Binary files differnew file mode 100644 index 000000000..bc131eb25 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr.si diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_1.liv b/solr-8.3.1/server/solr/dash/data/index/_jr_1.liv Binary files differnew file mode 100644 index 000000000..22da1aa4f --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr_1.liv diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.doc Binary files differnew file mode 100644 index 000000000..94df5353c --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.doc diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tim Binary files differnew file mode 100644 index 000000000..2f078b0f1 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tim diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tip Binary files differnew file mode 100644 index 000000000..b6239f17d --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tip diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvd Binary files differnew file mode 100644 index 000000000..171be787e --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvd diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvm Binary files differnew file mode 100644 index 000000000..f76033c91 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvm diff --git a/solr-8.3.1/server/solr/dash/data/index/segments_d b/solr-8.3.1/server/solr/dash/data/index/segments_d Binary files differnew file mode 100644 index 000000000..1e98e2f77 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/segments_d diff --git a/solr-8.3.1/server/solr/dash/data/index/write.lock b/solr-8.3.1/server/solr/dash/data/index/write.lock new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/index/write.lock diff --git a/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000011 b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000011 Binary files differnew file mode 100644 index 000000000..12ce36e19 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000011 diff --git a/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 Binary files differnew file mode 100644 index 000000000..c2322ffbe --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 diff --git a/solr-8.3.1/server/solr/dash/data2/index/_199_1.liv b/solr-8.3.1/server/solr/dash/data2/index/_199_1.liv Binary files differnew file mode 100644 index 000000000..d339cd0c7 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data2/index/_199_1.liv diff --git a/solr-8.3.1/server/solr/dash/data2/index/_19h_1.liv b/solr-8.3.1/server/solr/dash/data2/index/_19h_1.liv Binary files differnew file mode 100644 index 000000000..de5c10cc7 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data2/index/_19h_1.liv diff --git a/solr-8.3.1/server/solr/dash/data2/index/write.lock b/solr-8.3.1/server/solr/dash/data2/index/write.lock new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data2/index/write.lock diff --git a/solr-8.3.1/server/solr/dash/data2/tlog/tlog.0000000000000000012 b/solr-8.3.1/server/solr/dash/data2/tlog/tlog.0000000000000000012 Binary files differnew file mode 100644 index 000000000..039bba561 --- /dev/null +++ b/solr-8.3.1/server/solr/dash/data2/tlog/tlog.0000000000000000012 diff --git a/solr-8.3.1/server/tmp/start_1669159736908453662.properties b/solr-8.3.1/server/tmp/start_1669159736908453662.properties new file mode 100644 index 000000000..07a40cbdc --- /dev/null +++ b/solr-8.3.1/server/tmp/start_1669159736908453662.properties @@ -0,0 +1,11 @@ +#start.jar properties +#Wed Jan 08 14:37:59 UTC 2020 +java.version.platform=8 +java.version=1.8.0_211 +java.version.micro=0 +jetty.home=C\:\\gitstuff\\GitCode\\Dash-Web\\solr-8.3.1\\server +java.version.minor=8 +jetty.home.uri=file\:///C\:/gitstuff/GitCode/Dash-Web/solr-8.3.1/server +jetty.base=C\:\\gitstuff\\GitCode\\Dash-Web\\solr-8.3.1\\server +java.version.major=1 +jetty.base.uri=file\:///C\:/gitstuff/GitCode/Dash-Web/solr-8.3.1/server diff --git a/solr-8.3.1/server/tmp/start_5906520416860122978.properties b/solr-8.3.1/server/tmp/start_5906520416860122978.properties new file mode 100644 index 000000000..4177968f4 --- /dev/null +++ b/solr-8.3.1/server/tmp/start_5906520416860122978.properties @@ -0,0 +1,11 @@ +#start.jar properties +#Wed Jan 08 14:30:05 UTC 2020 +java.version.platform=8 +java.version=1.8.0_211 +java.version.micro=0 +jetty.home=c\:\\gitstuff\\GitCode\\Dash-Web\\solr-8.3.1\\server +java.version.minor=8 +jetty.home.uri=file\:///c\:/gitstuff/GitCode/Dash-Web/solr-8.3.1/server +jetty.base=c\:\\gitstuff\\GitCode\\Dash-Web\\solr-8.3.1\\server +java.version.major=1 +jetty.base.uri=file\:///c\:/gitstuff/GitCode/Dash-Web/solr-8.3.1/server diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index db2a3c298..a1196ee1c 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -386,7 +386,7 @@ export class MainView extends React.Component { getScale={returnOne}> </DocumentView> </div> - <div style={{ position: "relative", height: `calc(100% - ${this._buttonBarHeight}px)`, width: "100%", overflow: "auto" }}> + <div className="mainView-contentArea" style={{ position: "relative", height: `calc(100% - ${this._buttonBarHeight}px)`, width: "100%", overflow: "visible" }}> <DocumentView Document={sidebarContent} DataDoc={undefined} diff --git a/src/client/views/collections/ParentDocumentSelector.tsx b/src/client/views/collections/ParentDocumentSelector.tsx index 422d01cee..24aa6ddfa 100644 --- a/src/client/views/collections/ParentDocumentSelector.tsx +++ b/src/client/views/collections/ParentDocumentSelector.tsx @@ -11,7 +11,7 @@ import { CollectionViewType } from "./CollectionView"; import { DocumentButtonBar } from "../DocumentButtonBar"; import { DocumentManager } from "../../util/DocumentManager"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faEdit } from "@fortawesome/free-solid-svg-icons"; +import { faEdit, faChevronCircleUp } from "@fortawesome/free-solid-svg-icons"; import { library } from "@fortawesome/fontawesome-svg-core"; import { MetadataEntryMenu } from "../MetadataEntryMenu"; import { DocumentView } from "../nodes/DocumentView"; @@ -86,11 +86,11 @@ export class ParentDocSelector extends React.Component<SelectorProps> { <SelectorContextMenu {...this.props} /> </div> ); - return <div title="Drag(create link) Tap(view links)" onPointerDown={e => e.stopPropagation()} className="parentDocumentSelector-linkFlyout"> - <Flyout anchorPoint={anchorPoints.RIGHT_TOP} + return <div title="Tap to View Contexts/Metadata" onPointerDown={e => e.stopPropagation()} className="parentDocumentSelector-linkFlyout"> + <Flyout anchorPoint={anchorPoints.LEFT_TOP} content={flyout}> <span className="parentDocumentSelector-button" > - <p>^</p> + <FontAwesomeIcon icon={faChevronCircleUp} size={"lg"} /> </span> </Flyout> </div>; @@ -124,7 +124,7 @@ export class ButtonSelector extends React.Component<{ Document: Doc, Stack: any </div> ); return <span title="Tap for menu" onPointerDown={e => e.stopPropagation()} className="buttonSelector"> - <Flyout anchorPoint={anchorPoints.RIGHT_TOP} content={flyout} stylesheet={this.customStylesheet}> + <Flyout anchorPoint={anchorPoints.LEFT_TOP} content={flyout} stylesheet={this.customStylesheet}> <FontAwesomeIcon icon={faEdit} size={"sm"} /> </Flyout> </span>; diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 63c17b1f6..29e7edd97 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -742,7 +742,8 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu const highlightColors = ["transparent", "maroon", "maroon", "yellow", "magenta", "cyan", "orange"]; const highlightStyles = ["solid", "dashed", "solid", "solid", "solid", "solid", "solid"]; - const highlighting = fullDegree && this.layoutDoc.type !== DocumentType.FONTICON && this.layoutDoc.viewType !== CollectionViewType.Linear; + let highlighting = fullDegree && this.layoutDoc.type !== DocumentType.FONTICON && this.layoutDoc.viewType !== CollectionViewType.Linear; + highlighting = highlighting && this.props.focus !== emptyFunction; // bcz: hack to turn off highlighting onsidebar panel documents. need to flag a document as not highlightable in a more direct way return <div className={`documentView-node${this.topMost ? "-topmost" : ""}`} ref={this._mainCont} onKeyDown={this.onKeyDown} onDrop={this.onDrop} onContextMenu={this.onContextMenu} onPointerDown={this.onPointerDown} onClick={this.onClick} onPointerEnter={e => Doc.BrushDoc(this.props.Document)} onPointerLeave={e => Doc.UnBrushDoc(this.props.Document)} diff --git a/src/client/views/search/SearchBox.scss b/src/client/views/search/SearchBox.scss index 4eb992d36..0825580b7 100644 --- a/src/client/views/search/SearchBox.scss +++ b/src/client/views/search/SearchBox.scss @@ -70,8 +70,7 @@ display: flex; flex-direction: column; height: 100%; - overflow: hidden; - overflow-y: auto; + overflow: visible; .no-result { width: 500px; diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx index 2f28ebf76..dd1ac7421 100644 --- a/src/client/views/search/SearchBox.tsx +++ b/src/client/views/search/SearchBox.tsx @@ -353,7 +353,8 @@ export class SearchBox extends React.Component { </div> <div className="searchBox-results" onScroll={this.resultsScrolled} style={{ display: this._resultsOpen ? "flex" : "none", - height: this.resFull ? "auto" : this.resultHeight, overflow: this.resFull ? "auto" : "visible" + height: this.resFull ? "auto" : this.resultHeight, + overflow: "visibile" // this.resFull ? "auto" : "visible" }} ref={this.resultsRef}> {this._visibleElements} </div> diff --git a/src/client/views/search/SearchItem.scss b/src/client/views/search/SearchItem.scss index 82ff96700..469f062b2 100644 --- a/src/client/views/search/SearchItem.scss +++ b/src/client/views/search/SearchItem.scss @@ -1,22 +1,14 @@ @import "../globalCssVariables"; -.search-overview { +.searchItem-overview { display: flex; flex-direction: reverse; justify-content: flex-end; z-index: 0; } -.link-count { - background: black; - border-radius: 20px; - color: white; - width: 15px; - text-align: center; - margin-top: 5px; -} .searchBox-placeholder, -.search-overview .search-item { +.searchItem-overview .searchItem { width: 100%; background: $light-color-secondary; border-color: $intermediate-color; @@ -26,19 +18,19 @@ max-height: 150px; height: auto; z-index: 0; - display: inline-block; - overflow: auto; + display: flex; + overflow: visible; - .main-search-info { + .searchItem-body { display: flex; flex-direction: row; width: 100%; - .search-title-container { + .searchItem-title-container { width: 100%; overflow: hidden; - .search-title { + .searchItem-title { text-transform: uppercase; text-align: left; width: 100%; @@ -46,75 +38,28 @@ } } - .search-info { + .searchItem-info { display: flex; justify-content: flex-end; - .link-container.item { - margin-left: auto; - margin-right: auto; - height: 26px; - width: 26px; - border-radius: 13px; - background: $dark-color; - color: $light-color-secondary; - display: flex; - justify-content: center; - align-items: center; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; - transform-origin: top right; - overflow: hidden; - position: relative; - - - .link-extended { - // display: none; - visibility: hidden; - opacity: 0; - position: relative; - z-index: 500; - overflow: hidden; - -webkit-transition: opacity 0.2s ease-in-out .2s, visibility 0s linear 0s; - -moz-transition: opacity 0.2s ease-in-out .2s, visibility 0s linear 0s; - -o-transition: opacity 0.2s ease-in-out .2s, visibility 0s linear 0s; - transition: opacity 0.2s ease-in-out .2s, visibility 0s linear 0s; - // transition-delay: 1s; - } - - } - - .link-container.item:hover { - width: 70px; - } - - .link-container.item:hover .link-count { - opacity: 0; - } - - .link-container.item:hover .link-extended { - opacity: 1; - visibility: visible; - // display: inline; - } - .icon-icons { width: 50px } .icon-live { width: 175px; + height: 0px; } + .icon-icons { + height:auto; + } .icon-icons, .icon-live { - height: auto; margin: auto; - overflow: hidden; + overflow: visible; - .search-type { + .searchItem-type { display: inline-block; width: 100%; position: absolute; @@ -133,11 +78,11 @@ } } - .search-type:hover+.search-label { + .searchItem-type:hover+.searchItem-label { opacity: 1; } - .search-label { + .searchItem-label { font-size: 10; position: relative; right: 0px; @@ -151,8 +96,6 @@ } .icon-live:hover { - height: 175px; - .pdfBox-cont { img { width: 100% !important; @@ -161,42 +104,44 @@ } } - .search-info:hover { + .searchItem-info:hover { width: 60%; } } } -.search-item:hover~.searchBox-instances, +.searchItem:hover~.searchBox-instances, .searchBox-instances:hover, .searchBox-instances:active { opacity: 1; background: $lighter-alt-accent; - width:150px } -.search-item:hover { +.searchItem:hover { transition: all 0.2s; background: $lighter-alt-accent; } -.search-highlighting { +.searchItem-highlighting { overflow: hidden; text-overflow: ellipsis; white-space: pre; } .searchBox-instances { - float: left; opacity: 1; - width: 0px; + width:40px; + height:40px; + background: gray; transition: all 0.2s ease; color: black; overflow: hidden; + right:-100; + display:inline-block; } -.search-overview:hover { +.searchItem-overview:hover { z-index: 1; } diff --git a/src/client/views/search/SearchItem.tsx b/src/client/views/search/SearchItem.tsx index 673cb7937..32ba5d19d 100644 --- a/src/client/views/search/SearchItem.tsx +++ b/src/client/views/search/SearchItem.tsx @@ -17,11 +17,11 @@ import { SEARCH_THUMBNAIL_SIZE } from "../../views/globalCssVariables.scss"; import { CollectionViewType } from "../collections/CollectionView"; import { CollectionDockingView } from "../collections/CollectionDockingView"; import { ContextMenu } from "../ContextMenu"; -import { DocumentView } from "../nodes/DocumentView"; import { SearchBox } from "./SearchBox"; import "./SearchItem.scss"; import "./SelectorContextMenu.scss"; import { ContentFittingDocumentView } from "../nodes/ContentFittingDocumentView"; +import { ButtonSelector, ParentDocSelector } from "../collections/ParentDocumentSelector"; export interface SearchItemProps { doc: Doc; @@ -188,24 +188,12 @@ export class SearchItem extends React.Component<SearchItemProps> { layoutresult.indexOf(DocumentType.HIST) !== -1 ? faChartBar : layoutresult.indexOf(DocumentType.WEB) !== -1 ? faGlobeAsia : faCaretUp; - return <div onPointerDown={action(() => { this._useIcons = false; this._displayDim = Number(SEARCH_THUMBNAIL_SIZE); })} > + return <div onClick={action(() => { this._useIcons = false; this._displayDim = Number(SEARCH_THUMBNAIL_SIZE); })} > <FontAwesomeIcon icon={button} size="2x" /> </div>; } collectionRef = React.createRef<HTMLDivElement>(); - startDocDrag = () => { - const doc = this.props.doc; - const isProto = Doc.GetT(doc, "isPrototype", "boolean", true); - if (isProto) { - return Doc.MakeDelegate(doc); - } else { - return Doc.MakeAlias(doc); - } - } - - @computed - get linkCount() { return DocListCast(this.props.doc.links).length; } @action pointerDown = (e: React.PointerEvent) => { e.preventDefault(); e.button === 0 && SearchBox.Instance.openSearch(e); } @@ -258,43 +246,62 @@ export class SearchItem extends React.Component<SearchItemProps> { ContextMenu.Instance.displayMenu(e.clientX, e.clientY); } + _downX = 0; + _downY = 0; + _target: any; onPointerDown = (e: React.PointerEvent<HTMLDivElement>) => { + this._downX = e.clientX; + this._downY = e.clientY; e.stopPropagation(); - const doc = Doc.IsPrototype(this.props.doc) ? Doc.MakeDelegate(this.props.doc) : this.props.doc; - DragManager.StartDocumentDrag([e.currentTarget], new DragManager.DocumentDragData([doc]), e.clientX, e.clientY); + this._target = e.currentTarget; + document.removeEventListener("pointermove", this.onPointerMoved); + document.removeEventListener("pointerup", this.onPointerUp); + document.addEventListener("pointermove", this.onPointerMoved); + document.addEventListener("pointerup", this.onPointerUp); + } + onPointerMoved = (e: PointerEvent) => { + if (Math.abs(e.clientX - this._downX) > Utils.DRAG_THRESHOLD || + Math.abs(e.clientY - this._downY) > Utils.DRAG_THRESHOLD) { + console.log("DRAGGIGNG"); + document.removeEventListener("pointermove", this.onPointerMoved); + document.removeEventListener("pointerup", this.onPointerUp); + const doc = Doc.IsPrototype(this.props.doc) ? Doc.MakeDelegate(this.props.doc) : this.props.doc; + DragManager.StartDocumentDrag([this._target], new DragManager.DocumentDragData([doc]), e.clientX, e.clientY); + } + } + onPointerUp = (e: PointerEvent) => { + document.removeEventListener("pointermove", this.onPointerMoved); + document.removeEventListener("pointerup", this.onPointerUp); + } + + @computed + get contextButton() { + return <ParentDocSelector Views={DocumentManager.Instance.DocumentViews} Document={this.props.doc} addDocTab={(doc, data, where) => CollectionDockingView.AddRightSplit(doc, data)} />; } render() { const doc1 = Cast(this.props.doc.anchor1, Doc); const doc2 = Cast(this.props.doc.anchor2, Doc); - return ( - <div className="search-overview" onPointerDown={this.pointerDown} onContextMenu={this.onContextMenu}> - <div className="search-item" onPointerDown={this.nextHighlight} onPointerEnter={this.highlightDoc} onPointerLeave={this.unHighlightDoc} id="result" - onClick={this.onClick}> - <div className="main-search-info"> - <div title="Drag as document" onPointerDown={this.onPointerDown} style={{ marginRight: "7px" }}> <FontAwesomeIcon icon="file" size="lg" /> - <div className="link-container item"> - <div className="link-count" title={`${this.linkCount + " links"}`}>{this.linkCount}</div> - </div> - </div> - <div className="search-title-container"> - <div className="search-title">{StrCast(this.props.doc.title)}</div> - <div className="search-highlighting">{this.props.highlighting.length ? "Matched fields:" + this.props.highlighting.join(", ") : this.props.lines.length ? this.props.lines[0] : ""}</div> - {this.props.lines.filter((m, i) => i).map((l, i) => <div id={i.toString()} className="search-highlighting">`${l}`</div>)} - </div> - <div className="search-info" style={{ width: this._useIcons ? "15%" : "100%" }}> - <div className={`icon-${this._useIcons ? "icons" : "live"}`}> - <div className="search-type" title="Click to Preview">{this.DocumentIcon()}</div> - <div className="search-label">{this.props.doc.type ? this.props.doc.type : "Other"}</div> - </div> - </div> + return <div className="searchItem-overview" onPointerDown={this.pointerDown} onContextMenu={this.onContextMenu}> + <div className="searchItem" onPointerDown={this.nextHighlight} onPointerEnter={this.highlightDoc} onPointerLeave={this.unHighlightDoc}> + <div className="searchItem-body" onClick={this.onClick}> + <div className="searchItem-title-container"> + <div className="searchItem-title">{StrCast(this.props.doc.title)}</div> + <div className="searchItem-highlighting">{this.props.highlighting.length ? "Matched fields:" + this.props.highlighting.join(", ") : this.props.lines.length ? this.props.lines[0] : ""}</div> + {this.props.lines.filter((m, i) => i).map((l, i) => <div id={i.toString()} className="searchItem-highlighting">`${l}`</div>)} </div> </div> - <div className="searchBox-instances"> + <div className="searchItem-info" style={{ width: this._useIcons ? "30px" : "100%" }}> + <div className={`icon-${this._useIcons ? "icons" : "live"}`}> + <div className="searchItem-type" title="Click to Preview" onPointerDown={this.onPointerDown}>{this.DocumentIcon()}</div> + <div className="searchItem-label">{this.props.doc.type ? this.props.doc.type : "Other"}</div> + </div> + </div> + <div className="searchItem-context" title="Drag as document"> {(doc1 instanceof Doc && doc2 instanceof Doc) && this.props.doc.type === DocumentType.LINK ? <LinkContextMenu doc1={doc1} doc2={doc2} /> : - <SelectorContextMenu {...this.props} />} + this.contextButton} </div> </div> - ); + </div>; } }
\ No newline at end of file |