Merge pull request #1094 from ascholerChemeketa/refactor-data-attrs

Refactor boolean data attr parsing

Author: bnmnetp

bases/rsptx/interactives/runestone/activecode/js/activecode.js

@@ -92,7 +92,7 @@ export class ActiveCode extends RunestoneBase {
         this.tie = $(orig).data("tie");
         this.dburl = $(orig).data("dburl");
         this.runButton = null;
-        this.enabledownload = $(orig).data("enabledownload");
+        this.enabledownload = this.parseBooleanAttribute(orig, "data-enabledownload");
         this.downloadButton = null;
         this.saveButton = null;
         this.loadButton = null;
@@ -101,7 +101,7 @@ export class ActiveCode extends RunestoneBase {
         this.runCount = 0;
         this.firstAfterRun = true;
         this.logResults = true;
-        if (!eBookConfig.allow_pairs || $(orig).data("nopair")) {
+        if (!eBookConfig.allow_pairs || this.parseBooleanAttribute(orig, "data-nopair")) {
             this.enablePartner = false;
         } else {
             this.enablePartner = true;
@@ -113,7 +113,7 @@ export class ActiveCode extends RunestoneBase {
         this.controlDiv = null;
         this.historyScrubber = null;
         this.timestamps = ["Original"];
-        this.autorun = $(orig).data("autorun");
+        this.autorun = this.parseBooleanAttribute(orig, "data-autorun");
         this.outputLineCount = 0;
         this.outputLines = [];
         if (this.chatcodes && eBookConfig.enable_chatcodes) {
@@ -1076,15 +1076,15 @@ export class ActiveCode extends RunestoneBase {
         if (!this.hidecode && !this.hidehistory) {
             this.addHistoryScrubber(true);
         }
-        if ($(this.origElem).data("gradebutton") && !this.graderactive) {
+        if (this.parseBooleanAttribute(this.origElem, "data-gradebutton") && !this.graderactive) {
             this.addFeedbackButton(ctrlDiv);
         }
         // Show/Hide Code
         if (this.hidecode) {
             this.enableHideShow(ctrlDiv);
         }
         // CodeLens
-        if ($(this.origElem).data("codelens") && !this.graderactive) {
+        if (this.parseBooleanAttribute(this.origElem, "data-codelens") && !this.graderactive) {
             this.enableCodeLens(ctrlDiv);
         }
 

bases/rsptx/interactives/runestone/common/js/runestonebase.js

@@ -40,11 +40,7 @@ export default class RunestoneBase {
             if (opts.enforceDeadline) {
                 this.deadline = opts.deadline;
             }
-            if ($(opts.orig).data("optional")) {
-                this.optional = true;
-            } else {
-                this.optional = false;
-            }
+            this.optional = this.parseBooleanAttribute(opts.orig, "data-optional");
             if (opts.selector_id) {
                 this.selector_id = opts.selector_id;
             }

bases/rsptx/interactives/runestone/datafile/js/datafile.js

@@ -21,14 +21,10 @@ class DataFile extends RunestoneBase {
         var orig = opts.orig; // entire <pre> element that will be replaced by new HTML
         this.origElem = orig;
         this.divid = orig.id;
-        this.dataEdit = false;
-        this.isImage = orig.dataset.isimage === "true" || orig.dataset.isimage === "" ? true : false;
-        this.fileName = orig.dataset.filename || null;
-        if (orig.dataset.edit === "true") {
-            this.dataEdit = true;
-        }
+        this.dataEdit = this.parseBooleanAttribute(orig, "data-edit");
+        this.isImage = this.parseBooleanAttribute(orig, "data-isimage");
         this.displayClass = "block"; // Users can specify the non-edit component to be hidden--default is not hidden
-        if (orig.hasAttribute("data-hidden")) {
+        if (this.parseBooleanAttribute(orig, "data-hidden")) {
             this.displayClass = "none";
         }
         // Users can specify numbers of rows/columns when editing is true

bases/rsptx/interactives/runestone/hparsons/js/hparsons.js

@@ -22,9 +22,9 @@ export default class HParsons extends RunestoneBase {
         super(opts);
         // getting settings
         var orig = opts.orig.querySelector("textarea");
-        this.reuse = orig.getAttribute("data-reuse") ? true : false;
-        this.randomize = orig.getAttribute("data-randomize") ? true : false;
-        this.isBlockGrading = orig.getAttribute("data-blockanswer") ? true : false;
+        this.reuse = this.parseBooleanAttribute(orig, "data-reuse");
+        this.randomize = this.parseBooleanAttribute(orig, "data-randomize");
+        this.isBlockGrading = this.parseBooleanAttribute(orig, "data-blockanswer");
         this.language = orig.getAttribute("data-language");
         // Detect math mode
         if (this.language === undefined && orig.textContent.includes('span class="process-math"')) {