Commit 749947be authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/F7783FormElementCodeAnnotation' into...

Merge remote-tracking branch 'origin/F7783FormElementCodeAnnotation' into F7783FormElementCodeAnnotation
parents 1d54e375 c58a80bd
Pipeline #1438 passed with stage
in 2 minutes and 10 seconds
......@@ -42,7 +42,7 @@
<div class="col-md-2"></div>
<div class="col-md-8">
<div class="codeCorrection"
<div class="annotate-text"
data-uid='{uid: 5, name: "Definitely not an AI", avatar: "mockData/avatar1.png"}' <!-- logged in user -->
data-file="../javascript/src/CodeCorrection.js" <!-- File to correct -->
data-target="codeCorrection-output1" <!-- input field -->
......@@ -100,7 +100,7 @@
var codeCorrection = new QfqNS.CodeCorrection(qfqPage, {
url: '../javascript/src/CodeCorrection.js'
}, $('.codeCorrection'), $('#codeCorrection-output1'), {
}, $('.annotate-text'), $('#codeCorrection-output1'), {
uid: 5,
name: "Definitely not an AI",
avatar: "mockData/avatar1.png"
......
......@@ -41,7 +41,7 @@
<div class="row">
<div class="col-md-4">
<div class="fabric"
<div class="annotate-graphic"
data-buttons="mockData/fabric.buttons.json"
data-emojis="mockData/qfq.emoji.json"
data-control-name='fabric-output'
......
......@@ -39,7 +39,7 @@
<div class="row">
<div class="col-md-4">
<div class="fabric"
<div class="annotate-graphic"
data-buttons="mockData/fabric.editor.buttons.json"
data-edit-image="true"
data-background-image="mockData/Scan2a.jpeg"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment