Skip to content

Commit a4f0698

Browse files
author
Rob Myers
committed
Escape quotes in strings. Remove Section 3 logic.
1 parent 2f39c77 commit a4f0698

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

wordpress-plugin/js/questions.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Questions.s1q1ci = {
105105

106106
Questions.s1q1d = {
107107
question: 'What is the year of the agreement or transfer?',
108-
explanation:'When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work's copyright transfer may be eligible for termination.',
108+
explanation:'When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work\'s copyright transfer may be eligible for termination.',
109109
variable: 'k_year',
110110
input: 'year',
111111
validate: function () {
@@ -181,7 +181,7 @@ Questions.s2q2c = {
181181
// Was there an express agreement between the author and the author's employer to not treat the work as a work made for hire?
182182

183183
Questions.s2q2ci = {
184-
question: 'Was there an express agreement the author and the author's employer to not treat the work as a <a href="./glossary.php#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
184+
question: 'Was there an express agreement the author and the author\'s employer to not treat the work as a <a href="./glossary.php#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
185185
variable: 'express_agreement',
186186
input: 'radio'
187187
};
@@ -344,7 +344,7 @@ Questions.getResultDetails = function (specifier) {
344344
////////////////////////////////////////////////////////////////////////////////
345345

346346
Questions.first_question = 's1q1a';
347-
Questions.last_question = 's3q3e';
347+
Questions.last_question = 's2q2fii';
348348

349349
Questions.progress_stack = [];
350350

@@ -363,7 +363,7 @@ Questions.transitionQuestion = function (next_question) {
363363
previous_question.post();
364364
}
365365
}
366-
if (next_question == 'FINISH') {
366+
if (next_question == 'finish') {
367367
Questions.finish();
368368
} else {
369369
Questions.current_question = next_question;

wordpress-plugin/js/rules.js

+1-27
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Rules.simpleYesNoRule = function (variable_id, yesValue, noValue) {
3131
};
3232
};
3333

34-
Rules.jumpToSectionThree = 's3q3a';
3534
Rules.jumpToFinish = 'finish';
3635

3736
Rules.conclusion = function (conclusion) {
@@ -42,7 +41,7 @@ Rules.conclusion = function (conclusion) {
4241
Rules.conclusionPDF = function (conclusion) {
4342
Rules.conclusion(conclusion);
4443
Values.conclusion_generate_pdf = true;
45-
return Rules.jumpToSectionThree;
44+
return Rules.jumpToFinish;
4645
};
4746

4847
Rules.addFlag = function(flag) {
@@ -495,28 +494,3 @@ Rules.s2q2fii = function () {
495494
}
496495
return result
497496
};
498-
499-
500-
// Title of Work
501-
502-
Rules.s3q3a = function () {
503-
var result = undefined;
504-
if (Values.work_registered == 'yes') {
505-
result = 's3q3b';
506-
} else {
507-
result = 's3q3d';
508-
}
509-
return result
510-
};
511-
512-
// Copyright Registration Number
513-
// Note that 3c was deleted, so we go to 3d (renumber?)
514-
Rules.s3q3b = 's3q3d';
515-
516-
// Description of the Agreement or Transfer
517-
518-
Rules.s3q3d = 's3q3e';
519-
520-
// Please list all authors or artists of the work
521-
522-
Rules.s3q3e = 'finish';

0 commit comments

Comments
 (0)