aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrewdkim <adkim414@gmail.com>2020-02-22 13:52:36 -0500
committerandrewdkim <adkim414@gmail.com>2020-02-22 13:52:36 -0500
commitfd7f4618f23ee547d8dd14d54172085875058667 (patch)
tree7486436efed7030326ac7030029729046dc2e019
parent2352407ef1722031df20e51f3dce7aff6f3f6c00 (diff)
push
-rw-r--r--package-lock.json4
-rw-r--r--solr-8.3.1/bin/solr-8983.pid2
-rw-r--r--solr-8.3.1/server/tmp/start_1935456665153398890.properties11
-rw-r--r--solr-8.3.1/server/tmp/start_5098042466590842962.properties11
-rw-r--r--solr-8.3.1/server/tmp/start_5201032335657884982.properties11
-rw-r--r--solr-8.3.1/server/tmp/start_5906520416860122978.properties11
-rw-r--r--solr-8.3.1/server/tmp/start_5982280610074344638.properties11
-rw-r--r--solr-8.3.1/server/tmp/start_8210707001248201939.properties11
-rw-r--r--src/client/documents/Documents.ts4
-rw-r--r--src/server/authentication/models/current_user_utils.ts2
10 files changed, 6 insertions, 72 deletions
diff --git a/package-lock.json b/package-lock.json
index 049c91fcf..833710fe7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16239,7 +16239,7 @@
},
"string_decoder": {
"version": "1.1.1",
- "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
@@ -18560,7 +18560,7 @@
},
"wrap-ansi": {
"version": "2.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"requires": {
"string-width": "^1.0.1",
diff --git a/solr-8.3.1/bin/solr-8983.pid b/solr-8.3.1/bin/solr-8983.pid
index a6905f8ba..d1b546ea3 100644
--- a/solr-8.3.1/bin/solr-8983.pid
+++ b/solr-8.3.1/bin/solr-8983.pid
@@ -1 +1 @@
-999
+7100
diff --git a/solr-8.3.1/server/tmp/start_1935456665153398890.properties b/solr-8.3.1/server/tmp/start_1935456665153398890.properties
deleted file mode 100644
index a694ae90a..000000000
--- a/solr-8.3.1/server/tmp/start_1935456665153398890.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#start.jar properties
-#Thu Jan 09 14:51:58 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_5098042466590842962.properties b/solr-8.3.1/server/tmp/start_5098042466590842962.properties
deleted file mode 100644
index 194d8ff5c..000000000
--- a/solr-8.3.1/server/tmp/start_5098042466590842962.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#start.jar properties
-#Thu Jan 09 23:36:29 UTC 2020
-java.version.platform=8
-java.version=1.8.0_131
-java.version.micro=0
-jetty.home=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server
-java.version.minor=8
-jetty.home.uri=file\:///C\:/Users/avd/Desktop/Sam/Dash-Web/solr-8.3.1/server
-jetty.base=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server
-java.version.major=1
-jetty.base.uri=file\:///C\:/Users/avd/Desktop/Sam/Dash-Web/solr-8.3.1/server
diff --git a/solr-8.3.1/server/tmp/start_5201032335657884982.properties b/solr-8.3.1/server/tmp/start_5201032335657884982.properties
deleted file mode 100644
index e3a72dc76..000000000
--- a/solr-8.3.1/server/tmp/start_5201032335657884982.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#start.jar properties
-#Wed Jan 08 17:27:07 UTC 2020
-java.version.platform=8
-java.version=1.8.0_131
-java.version.micro=0
-jetty.home=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server
-java.version.minor=8
-jetty.home.uri=file\:///C\:/Users/avd/Desktop/Sam/Dash-Web/solr-8.3.1/server
-jetty.base=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server
-java.version.major=1
-jetty.base.uri=file\:///C\:/Users/avd/Desktop/Sam/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
deleted file mode 100644
index 4177968f4..000000000
--- a/solr-8.3.1/server/tmp/start_5906520416860122978.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#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/solr-8.3.1/server/tmp/start_5982280610074344638.properties b/solr-8.3.1/server/tmp/start_5982280610074344638.properties
deleted file mode 100644
index 840417082..000000000
--- a/solr-8.3.1/server/tmp/start_5982280610074344638.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#start.jar properties
-#Fri Dec 13 19:19:27 UTC 2019
-java.version.platform=8
-java.version=1.8.0_131
-java.version.micro=0
-jetty.home=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server
-java.version.minor=8
-jetty.home.uri=file\:///C\:/Users/avd/Desktop/Sam/Dash-Web/solr-8.3.1/server
-jetty.base=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server
-java.version.major=1
-jetty.base.uri=file\:///C\:/Users/avd/Desktop/Sam/Dash-Web/solr-8.3.1/server
diff --git a/solr-8.3.1/server/tmp/start_8210707001248201939.properties b/solr-8.3.1/server/tmp/start_8210707001248201939.properties
deleted file mode 100644
index aebc17bdc..000000000
--- a/solr-8.3.1/server/tmp/start_8210707001248201939.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#start.jar properties
-#Thu Jan 16 20:33:22 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/documents/Documents.ts b/src/client/documents/Documents.ts
index 622486435..144554cbc 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -594,8 +594,8 @@ export namespace Docs {
return InstanceFromProto(Prototypes.get(DocumentType.RECOMMENDATION), new List<Doc>(data), options);
}
- export function SearchDocument(data: Doc[], options: DocumentOptions = {}) {
- return InstanceFromProto(Prototypes.get(DocumentType.SEARCH), new List<Doc>(data), options);
+ export function SearchDocument(options: DocumentOptions = {}) {
+ return InstanceFromProto(Prototypes.get(DocumentType.SEARCH), new List<Doc>(), options);
}
export type DocConfig = {
diff --git a/src/server/authentication/models/current_user_utils.ts b/src/server/authentication/models/current_user_utils.ts
index 009d013fe..ec6fdc021 100644
--- a/src/server/authentication/models/current_user_utils.ts
+++ b/src/server/authentication/models/current_user_utils.ts
@@ -64,7 +64,7 @@ export class CurrentUserUtils {
{ title: "use eraser", icon: "eraser", click: 'activateEraser(this.activePen.pen = sameDocs(this.activePen.pen, this) ? undefined : this);', ischecked: `sameDocs(this.activePen.pen, this)`, backgroundColor: "pink", activePen: doc },
{ title: "use scrubber", icon: "eraser", click: 'activateScrubber(this.activePen.pen = sameDocs(this.activePen.pen, this) ? undefined : this);', ischecked: `sameDocs(this.activePen.pen, this)`, backgroundColor: "green", activePen: doc },
{ title: "use drag", icon: "mouse-pointer", click: 'deactivateInk();this.activePen.pen = this;', ischecked: `sameDocs(this.activePen.pen, this)`, backgroundColor: "white", activePen: doc },
- { title: "cat image", icon: "cat", ignoreClick: true, drag: 'Docs.Create.SearchDocument("https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg", { _width: 200, title: "an image of a cat" })' },
+ { title: "searc", icon: "bolt", ignoreClick: true, drag: 'Docs.Create.SearchDocument("https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg", { _width: 200, title: "an image of a cat" })' },
];