aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryipstanley <stanley_yip@brown.edu>2019-07-30 16:33:37 -0400
committeryipstanley <stanley_yip@brown.edu>2019-07-30 16:33:37 -0400
commit676534c7ad5fd5fa155f4b76856ff33a08d8ab49 (patch)
treea0fcb6d4f4cfc94ad2303eb85d4ead323260d894
parent7c3b56a2e4552308014aa011493b33e3b054be94 (diff)
object field scripting
-rw-r--r--src/client/views/collections/CollectionViewChromes.scss2
-rw-r--r--src/new_fields/ObjectField.ts3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionViewChromes.scss b/src/client/views/collections/CollectionViewChromes.scss
index c062c3261..1738ac227 100644
--- a/src/client/views/collections/CollectionViewChromes.scss
+++ b/src/client/views/collections/CollectionViewChromes.scss
@@ -37,7 +37,7 @@
}
.collectionViewBaseChrome-collapse {
- transition: all .5s opacity 0.2s;
+ transition: all .5s, opacity 0.3s;
position: absolute;
width: 40px;
transform-origin: top left;
diff --git a/src/new_fields/ObjectField.ts b/src/new_fields/ObjectField.ts
index 5f4a6f8fb..65ada91c0 100644
--- a/src/new_fields/ObjectField.ts
+++ b/src/new_fields/ObjectField.ts
@@ -1,6 +1,7 @@
import { Doc } from "./Doc";
import { RefField } from "./RefField";
import { OnUpdate, Parent, Copy, ToScriptString } from "./FieldSymbols";
+import { Scripting } from "../client/util/Scripting";
export abstract class ObjectField {
protected [OnUpdate](diff?: any) { }
@@ -15,3 +16,5 @@ export namespace ObjectField {
return field[Copy]();
}
}
+
+Scripting.addGlobal(ObjectField); \ No newline at end of file