« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/data/things
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/things')
-rw-r--r--src/data/things/content/CreditingSourcesEntry.js4
-rw-r--r--src/data/things/content/ReferencingSourcesEntry.js4
-rw-r--r--src/data/things/flash/FlashAct.js27
3 files changed, 29 insertions, 6 deletions
diff --git a/src/data/things/content/CreditingSourcesEntry.js b/src/data/things/content/CreditingSourcesEntry.js
index 0f7e266e..6b9880f1 100644
--- a/src/data/things/content/CreditingSourcesEntry.js
+++ b/src/data/things/content/CreditingSourcesEntry.js
@@ -3,6 +3,8 @@ import Thing from '#thing';
 
 import {exposeConstant} from '#composite/control-flow';
 
+import {hasAnnotationPart} from '#composite/things/content';
+
 import {ContentEntry} from './ContentEntry.js';
 
 export class CreditingSourcesEntry extends ContentEntry {
@@ -13,5 +15,7 @@ export class CreditingSourcesEntry extends ContentEntry {
     // Expose only
 
     isCreditingSourcesEntry: exposeConstant(V(true)),
+
+    isWikiEditorSource: hasAnnotationPart(V('wiki editor')),
   });
 }
diff --git a/src/data/things/content/ReferencingSourcesEntry.js b/src/data/things/content/ReferencingSourcesEntry.js
index 4b27b313..de7deba0 100644
--- a/src/data/things/content/ReferencingSourcesEntry.js
+++ b/src/data/things/content/ReferencingSourcesEntry.js
@@ -3,6 +3,8 @@ import Thing from '#thing';
 
 import {exposeConstant} from '#composite/control-flow';
 
+import {hasAnnotationPart} from '#composite/things/content';
+
 import {ContentEntry} from './ContentEntry.js';
 
 export class ReferencingSourcesEntry extends ContentEntry {
@@ -13,5 +15,7 @@ export class ReferencingSourcesEntry extends ContentEntry {
     // Expose only
 
     isReferencingSourceEntry: exposeConstant(V(true)),
+
+    isWikiEditorSource: hasAnnotationPart(V('wiki editor')),
   });
 }
diff --git a/src/data/things/flash/FlashAct.js b/src/data/things/flash/FlashAct.js
index 66d4ee1b..d1c64b4b 100644
--- a/src/data/things/flash/FlashAct.js
+++ b/src/data/things/flash/FlashAct.js
@@ -1,13 +1,26 @@
-
 import {input, V} from '#composite';
 import Thing from '#thing';
-import {isContentString} from '#validators';
+import {isContentString, isString} from '#validators';
 
 import {withPropertyFromObject} from '#composite/data';
-import {exposeConstant, exposeDependency, exposeUpdateValueOrContinue}
-  from '#composite/control-flow';
-import {color, directory, name, soupyFind, soupyReverse, thing, thingList}
-  from '#composite/wiki-properties';
+
+import {
+  exitWithoutDependency,
+  exposeConstant,
+  exposeDependency,
+  exposeUpdateValueOrContinue,
+} from '#composite/control-flow';
+
+import {
+  color,
+  directory,
+  name,
+  simpleString,
+  soupyFind,
+  soupyReverse,
+  thing,
+  thingList
+} from '#composite/wiki-properties';
 
 export class FlashAct extends Thing {
   static [Thing.referenceType] = 'flash-act';
@@ -20,6 +33,7 @@ export class FlashAct extends Thing {
     side: thing(V(FlashSide)),
 
     name: name(V('Unnamed Flash Act')),
+    nameHTML: simpleString(),
     directory: directory(),
     color: color(),
 
@@ -63,6 +77,7 @@ export class FlashAct extends Thing {
   static [Thing.yamlDocumentSpec] = {
     fields: {
       'Act': {property: 'name'},
+      'Act HTML': {property: 'nameHTML'},
       'Directory': {property: 'directory'},
 
       'Color': {property: 'color'},