Skip to content

Commit

Permalink
Annotations: track text selection and allow copy and past if you are …
Browse files Browse the repository at this point in the history
…in one form
  • Loading branch information
wolfgangmm committed Jan 26, 2024
1 parent 0c7f52a commit 51ebdb2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion modules/config.xqm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ declare variable $config:enable-proxy-caching :=
: In this case, change $config:webcomponents-cdn to point to http://localhost:port
: (default: 8000, but check where your server is running).
:)
declare variable $config:webcomponents := "2.18.4";
declare variable $config:webcomponents := "2.19.0";

(:~
: CDN URL to use for loading webcomponents. Could be changed if you created your
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"license": "GPL-3.0",
"dependencies": {
"@jinntec/fore": "^1.9.0",
"@teipublisher/pb-components": "^2.18.4"
"@teipublisher/pb-components": "^2.19.0"
},
"devDependencies": {
"adm-zip": "^0.5.9",
Expand Down
1 change: 1 addition & 0 deletions resources/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ body {
--pb-color-focus: #f6a623;
--pb-annotation-stripes-light: #e0e0ef;
--pb-annotation-stripes-dark: #50505f;
--pb-annotation-selection: #f9ea7643;
--pb-drawer-background-color: var(--pb-color-inverse);
--pb-menubar-background-color: #35424b;
--pb-menubar-color: var(--pb-color-inverse);
Expand Down
6 changes: 5 additions & 1 deletion templates/pages/annotate.html
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@
<fx-load url="templates/pages/annotation/{event('type')}-editor.html"
attach-to="#authority-editor"></fx-load>
<fx-setvalue ref="instance()/authority-editor" value="event('type')"></fx-setvalue>
<fx-dispatch name="pb-disable" targetid="view1"></fx-dispatch>
</fx-action>

<fx-action event="pb-authority-edit-entity" target="#document">
Expand All @@ -290,6 +291,7 @@
<fx-setvalue ref="instance()/authority-editor" value="event('type')"></fx-setvalue>
<fx-load url="templates/pages/annotation/{event('type')}-editor.html"
attach-to="#authority-editor"></fx-load>
<fx-dispatch name="pb-disable" targetid="view1"></fx-dispatch>
</fx-action>

<fx-action event="pb-authority-error" target="#document">
Expand All @@ -300,7 +302,6 @@
<!-- ### show the annotation form and the authority search -->
<fx-action id="show-annotation" event="show-annotation" target="#document">
<fx-call action="reset-panels"></fx-call>

<!-- ### show annotation details panel -->
<fx-setvalue ref="annotation">true</fx-setvalue>
</fx-action>
Expand All @@ -310,6 +311,7 @@
<fx-call action="reset-panels"></fx-call>
<fx-setvalue ref="annotation">true</fx-setvalue>
<fx-setvalue ref="ref" value="event('ref')"></fx-setvalue>

<!-- ### update the input in the iron-form with the text-selection we get from 'query' -->
<fx-call function="updateAnnotationDetails(event('ref'))"></fx-call>
<fx-update></fx-update>
Expand All @@ -320,6 +322,7 @@
<fx-load attach-to="#authority-editor">
<template><div></div></template>
</fx-load>
<fx-dispatch name="pb-enable" targetid="view1"></fx-dispatch>
</fx-action>


Expand All @@ -329,6 +332,7 @@
<!--fx-call function="updateAnnotationDetails(event('ref'))"></fx-call-->
<fx-setvalue ref="authority">false</fx-setvalue>
<fx-setvalue ref="occurrences">true</fx-setvalue>
<fx-dispatch name="pb-enable" targetid="view1"></fx-dispatch>
<fx-load attach-to="#authority-editor">
<template>
<div></div>
Expand Down

0 comments on commit 51ebdb2

Please sign in to comment.