issue/2647 add es6-8 support

grunt/config/babel.js

@@ -0,0 +1,30 @@
+module.exports = {
+  options: {
+    sourceMap: true,
+    inputSourceMap: true,
+    sourceType: 'script',
+    minified: true,
+    comments: false,
+    presets: [
+      [
+        '@babel/preset-env',
+        {
+          "targets": {
+            "ie": "11"
+          }
+        }
+      ]
+    ]
+  },
+  dist: {
+    files: [{
+      "expand": true,
+      "cwd": "<%= tempdir %>",
+      "src": [
+        "adapt.min.js"
+      ],
+      "dest": "<%= outputdir %>adapt/js/",
+      "ext": ".min.js"
+    }]
+  }
+};

grunt/config/clean.js

@@ -15,5 +15,10 @@ module.exports = {
     src: [
       '<%= outputdir %>'
     ]
+  },
+  temp: {
+    src: [
+      '<%= tempdir %>'
+    ]
   }
 };

grunt/config/javascript.js

@@ -5,7 +5,7 @@ module.exports = function(grunt, options) {
         name: 'core/js/app',
         baseUrl: '<%= sourcedir %>',
         mainConfigFile: './config.js',
-        out: '<%= outputdir %>adapt/js/adapt.min.js',
+        out: '<%= tempdir %>adapt.min.js',
         // fetch these bower plugins an add them as dependencies to the app.js
         plugins: [
           '<%= sourcedir %>components/*/bower.json',
@@ -37,7 +37,7 @@ module.exports = function(grunt, options) {
         name: 'core/js/app',
         baseUrl: '<%= sourcedir %>',
         mainConfigFile: './config.js',
-        out: '<%= outputdir %>adapt/js/adapt.min.js',
+        out: '<%= tempdir %>adapt.min.js',
         // fetch these bower plugins an add them as dependencies to the app.js
         plugins: [
           '<%= sourcedir %>components/*/bower.json',
@@ -51,10 +51,7 @@ module.exports = function(grunt, options) {
           return grunt.config('helpers').includedFilter(filepath);
         },
         preserveLicenseComments: false,
-        optimize: 'uglify2',
-        uglify2: {
-          compress: false
-        }
+        optimize: 'none'
       }
     }
   };

grunt/config/watch.js

@@ -26,7 +26,7 @@ module.exports = {
   },
   js: {
     files: ['<%= sourcedir %>**/*.js'],
-    tasks: ['javascript:dev']
+    tasks: ['javascript:dev', 'babel', 'clean:temp']
   },
   componentsAssets: {
     files: ['<%= sourcedir %>components/**/assets/**'],

grunt/helpers.js

@@ -186,6 +186,7 @@ module.exports = function(grunt) {
     var root = __dirname.split(path.sep).slice(0, -1).join(path.sep);
     var sourcedir = appendSlash(grunt.option('sourcedir')) || exports.defaults.sourcedir;
     var outputdir = appendSlash(grunt.option('outputdir')) || exports.defaults.outputdir;
+    var tempdir = outputdir + '.temp/';
     var jsonext = grunt.option('jsonext') || exports.defaults.jsonext;
 
     var languageFolders = '';
@@ -212,6 +213,7 @@ module.exports = function(grunt) {
       root: root,
       sourcedir: sourcedir,
       outputdir: outputdir,
+      tempdir: tempdir,
       jsonext: jsonext,
       theme: grunt.option('theme') || exports.defaults.theme,
       menu: grunt.option('menu') || exports.defaults.menu,

grunt/tasks/build.js

@@ -12,10 +12,12 @@ module.exports = function(grunt) {
     'handlebars',
     'tracking-insert',
     'javascript:compile',
+    'babel',
     'clean:dist',
     'less:compile',
     'replace',
     'scripts:adaptpostbuild',
+    'clean:temp',
     'minify'
   ]);
 };

grunt/tasks/dev.js

@@ -11,9 +11,11 @@ module.exports = function(grunt) {
     'handlebars',
     'tracking-insert',
     'javascript:dev',
+    'babel',
     'less:dev',
     'replace',
     'scripts:adaptpostbuild',
+    'clean:temp',
     'watch'
   ]);
 };

grunt/tasks/diff.js

@@ -11,8 +11,10 @@ module.exports = function(grunt) {
     'newer:handlebars:compile',
     'tracking-insert',
     'newer:javascript:dev',
+    'babel',
     'newer:less:dev',
     'replace',
-    'scripts:adaptpostbuild'
+    'scripts:adaptpostbuild',
+    'clean:temp'
   ]);
 };

grunt/tasks/server-build.js

@@ -12,8 +12,10 @@ module.exports = function(grunt) {
       'less:' + requireMode,
       'handlebars',
       'javascript:' + requireMode,
+      'babel',
       'replace',
-      'scripts:adaptpostbuild'
+      'scripts:adaptpostbuild',
+      'clean:temp'
     ]);
   });
 };

package.json

@@ -15,11 +15,16 @@
         "url": "https://github.com/adaptlearning/adapt_framework/issues"
     },
     "dependencies": {
+        "@babel/core": "^7.8.4",
+        "@babel/preset-env": "^7.8.4",
+        "@types/backbone": "^1.4.1",
+        "@types/jquery": "^3.3.31",
         "async": "^2.6.1",
         "chalk": "^2.4.1",
         "columnify": "^1.5.4",
         "csv": "^5.0.0",
         "grunt": "^1.0.3",
+        "grunt-babel": "^8.0.0",
         "grunt-concurrent": "^2.3.1",
         "grunt-contrib-clean": "^2.0.0",
         "grunt-contrib-connect": "^2.0.0",
@@ -36,8 +41,6 @@
         "jit-grunt": "^0.10.0",
         "jschardet": "^1.6.0",
         "jshint-stylish": "^2.2.1",
-        "@types/jquery": "^3.3.31",
-        "@types/backbone": "^1.4.1",
         "less": "^3.9.0",
         "load-grunt-config": "^1.0.1",
         "nsdeclare": "^0.1.0",

src/core/js/a11y/log.js

@@ -6,53 +6,55 @@ define([
    * Controller for managing accessibilty logging, specifically used for
    * controlling the display of removed or deprecated API warnings.
    */
-  var Log = Backbone.Controller.extend({
+  class Log extends Backbone.Controller {
 
-    _warned: {},
+    initialize() {
+      this._warned = {};
+    }
 
-    _hasWarned: function(args) {
+    _hasWarned(args) {
       var config = Adapt.a11y.config;
       if (!config._options._warnFirstOnly) {
         return false;
       }
-      var hash = _.map(args, String).join(':');
+      var hash = args.map(String).join(':');
       if (this._warned[hash]) {
         return true;
       }
       this._warned[hash] = true;
       return false;
-    },
+    }
 
-    _canWarn: function() {
+    _canWarn() {
       var config = Adapt.a11y.config;
       return Boolean(config._options._warn);
-    },
+    }
 
-    removed: function() {
+    removed(...args) {
       if (!this._canWarn) {
         return;
       }
-      var args = Array.prototype.slice.call(arguments);
+      args = ['A11Y'].concat(args);
       if (this._hasWarned(args)) {
         return;
       }
-      Adapt.log.warn.apply(Adapt.log, ['A11Y REMOVED:'].concat(args));
+      Adapt.log.removed(...args);
       return this;
-    },
+    }
 
-    deprecated: function() {
+    deprecated(...args) {
       if (!this._canWarn) {
         return;
       }
-      var args = Array.prototype.slice.call(arguments);
+      args = ['A11Y'].concat(args);
       if (this._hasWarned(args)) {
         return;
       }
-      Adapt.log.warn.apply(Adapt.log, ['A11Y DEPRECATED:'].concat(args));
+      Adapt.log.deprecated(...args);
       return this;
     }
 
-  });
+  }
 
   return Log;
 

src/core/js/data.js

@@ -4,14 +4,15 @@ define([
   'core/js/models/articleModel',
   'core/js/models/blockModel',
   'core/js/models/configModel',
-  'core/js/models/contentObjectModel',
+  'core/js/models/menuModel',
+  'core/js/models/pageModel',
   'core/js/models/componentModel',
   'core/js/models/courseModel',
   'core/js/models/questionModel',
   'core/js/models/lockingModel',
   'core/js/models/buildModel',
   'core/js/startController'
-], function(Adapt, AdaptCollection, ArticleModel, BlockModel, ConfigModel, ContentObjectModel, ComponentModel, CourseModel, QuestionModel) {
+], function(Adapt, AdaptCollection, ArticleModel, BlockModel, ConfigModel, MenuModel, PageModel, ComponentModel, CourseModel, QuestionModel) {
 
   var Data = Backbone.Controller.extend({
 
@@ -73,7 +74,14 @@ define([
       Adapt.course = new CourseModel(null, { url: courseFolder + 'course.' + jsonext, reset: true });
 
       Adapt.contentObjects = new AdaptCollection(null, {
-        model: ContentObjectModel,
+        model: function(json) {
+          switch (json._type) {
+            case 'page':
+              return new PageModel(json);
+            case 'menu':
+              return new MenuModel(json);
+          }
+        },
         url: courseFolder + 'contentObjects.' + jsonext
       });