issue/2645 Added manifest creation and loading

grunt/config/babel.js

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

grunt/config/watch.js

@@ -17,8 +17,8 @@ module.exports = {
     tasks: ['handlebars', 'javascript:dev']
   },
   courseJson: {
-    files: ['<%= sourcedir %>course/**/*.<%= jsonext %>'],
-    tasks: ['jsonlint', 'check-json', 'newer:copy:courseJson', 'schema-defaults']
+    files: ['<%= sourcedir %>course/**/*.<%= jsonext %>', '<%= outputdir %>course/*/language_data_manifest.js'],
+    tasks: ['language-data-manifests', 'jsonlint', 'check-json', 'newer:copy:courseJson', 'schema-defaults']
   },
   courseAssets: {
     files: ['<%= sourcedir %>course/<%=languages%>/*', '!<%= sourcedir %>course/<%=languages%>/*.<%= jsonext %>'],

grunt/tasks/build.js

@@ -9,10 +9,11 @@ module.exports = function(grunt) {
     'build-config',
     'copy',
     'schema-defaults',
+    'language-data-manifests',
     'handlebars',
     'tracking-insert',
     'javascript:compile',
-    'babel',
+    'babel:compile',
     'clean:dist',
     'less:compile',
     'replace',

grunt/tasks/dev.js

@@ -8,10 +8,11 @@ module.exports = function(grunt) {
     'build-config',
     'copy',
     'schema-defaults',
+    'language-data-manifests',
     'handlebars',
     'tracking-insert',
     'javascript:dev',
-    'babel',
+    'babel:dev',
     'less:dev',
     'replace',
     'scripts:adaptpostbuild',

grunt/tasks/diff.js

@@ -8,10 +8,11 @@ module.exports = function(grunt) {
     'build-config',
     'copy',
     'schema-defaults',
+    'language-data-manifests',
     'newer:handlebars:compile',
     'tracking-insert',
     'newer:javascript:dev',
-    'babel',
+    'babel:dev',
     'newer:less:dev',
     'replace',
     'scripts:adaptpostbuild',

grunt/tasks/language-data-manifests.js

@@ -0,0 +1,7 @@
+module.exports = function(grunt) {
+  const Helpers = require('../helpers')(grunt);
+  grunt.registerTask('language-data-manifests', 'Creates a manifest for each set of language data files', function() {
+    const languages = Helpers.getFramework({ useOutputData: true }).getData().languages;
+    languages.forEach(language => language.saveManifest());
+  });
+};

grunt/tasks/server-build.js

@@ -9,10 +9,11 @@ module.exports = function(grunt) {
       '_log-vars',
       'build-config',
       'copy',
+      'language-data-manifests',
       'less:' + requireMode,
       'handlebars',
       'javascript:' + requireMode,
-      'babel',
+      'babel:' + requireMode,
       'replace',
       'scripts:adaptpostbuild',
       'clean:temp'

src/core/js/collections/adaptCollection.js

@@ -5,13 +5,7 @@ define([
   class AdaptCollection extends Backbone.Collection {
 
     initialize(models, options) {
-      this.url = options.url;
       this.once('reset', this.loadedData, this);
-      if (!this.url) return;
-      this.fetch({
-        reset: true,
-        error: () => console.error('ERROR: unable to load file ' + this.url)
-      });
     }
 
     loadedData() {

src/core/js/collections/adaptSubsetCollection.js

@@ -0,0 +1,23 @@
+define([
+  'core/js/adapt',
+  './adaptCollection'
+], function(Adapt, AdaptCollection) {
+
+  class AdaptSubsetCollection extends AdaptCollection {
+
+    initialize(models, options) {
+      super.initialize(models, options);
+      this.parent = options.parent;
+      this.listenTo(this.parent, 'reset', this.loadSubset);
+    }
+
+    loadSubset() {
+      this.set(this.parent.filter(model => model instanceof this.model));
+      this._byAdaptID = this.groupBy('_id');
+    }
+
+  }
+
+  return AdaptSubsetCollection;
+
+});