issue-1519: default disable a11y on touch devices (#1520)

* issue-1519: default disable a11y on touch devices * issue-1519: flipped to _isEnabledOnTouchDevices * issue-1519: flipped to _isEnabledOnTouchDevices * issue-1519: flipped to _isEnabledOnTouchDevices * issue-1519: compatibility for _isDisabledOnTouchDevices
adaptlearning · May 18, 2017 · be7d695 · be7d695
1 parent 2c0204f
commit be7d695
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/core/js/accessibility.js b/src/core/js/accessibility.js
@@ -273,8 +273,12 @@ define([
  //Remove button
  this.$accessibilityToggle.remove();
  }
-
- if (!Modernizr.touch || this.isActive() || Adapt.config.get("_accessibility")._isDisabledOnTouchDevices) return;
+
+ var config = Adapt.config.get("_accessibility");
+ // Backwards compatibility for _isDisabledOnTouchDevices
+ var isEnabledOnTouchDevices = config._isEnabledOnTouchDevices || (config._isDisabledOnTouchDevices === false);
+
+ if (!Modernizr.touch || this.isActive() || !isEnabledOnTouchDevices) return;
 
  //If a touch device and not enabled, remove accessibility button and turn on accessibility
 

diff --git a/src/core/schema/config.model.schema b/src/core/schema/config.model.schema
@@ -54,14 +54,14 @@
  "title": "Enable accessibility?",
  "help": "If set to 'true', accessibility features will be enabled in this course"
  },
- "_isDisabledOnTouchDevices": {
+ "_isEnabledOnTouchDevices": {
  "type": "bool",
  "default": "false",
  "isSetting": false,
  "inputType": {"type": "Boolean", "options": [true, false]},
  "validators": [],
- "title": "Disable accessibility on touch devices?",
- "help": "If set to 'true', accessibility features will be disabled on touch devices - useful if you only need accessibility on desktop browsers."
+ "title": "Enable accessibility on touch devices?",
+ "help": "If set to 'true', accessibility features will be enabled on touch devices - useful if you need accessibility on mobile browsers."
  },
  "_shouldSupportLegacyBrowsers": {
  "type": "bool",

diff --git a/src/course/config.json b/src/course/config.json
@@ -9,7 +9,7 @@
  },
  "_accessibility": {
  "_isEnabled": true,
- "_isDisabledOnTouchDevices": false,
+ "_isEnabledOnTouchDevices": false,
  "_shouldSupportLegacyBrowsers": true,
  "_isTextProcessorEnabled": true,
  "_isSkipNavigationEnabled": true