Clean up externals global variables so it works with module loaders.

.jshintrc

@@ -15,11 +15,7 @@
     "predef" : [
         "it",
         "describe",
-        "ISOBoxer",
-        "ObjectIron",
-        "X2JS",
         "kendo",
-        "BASE64",
         "utils",
         "MediaPlayer",
         "Dash",

Gruntfile.js

@@ -34,14 +34,6 @@ module.exports = function (grunt) {
                 }
             },
 
-            build_all: {
-                options: {
-                    sourceMap: false,
-                },
-                files: {
-                    'build/temp/dash.all.min.js': ['build/temp/dash.no-externals.debug.js', 'externals/*.js']
-                }
-            },
             build_core: {
                 options: {
                     sourceMapIn: 'build/temp/dash.mediaplayer.debug.js.map'
@@ -50,11 +42,6 @@ module.exports = function (grunt) {
                     'build/temp/dash.mediaplayer.min.js': 'build/temp/dash.mediaplayer.debug.js'
                 }
             },
-            build_external: {
-                files: {
-                    'build/temp/dash.externals.min.js': 'externals/*.js',
-                }
-            },
             build_protection: {
                 options: {
                     sourceMapIn: 'build/temp/dash.protection.debug.js.map'
@@ -63,31 +50,24 @@ module.exports = function (grunt) {
                     'build/temp/dash.protection.min.js': 'build/temp/dash.protection.debug.js'
                 }
             },
-
-            debug_external: {
+            build_all: {
                 options: {
-                    sourceMap: true,
-                    sourceMapRoot: './externals',
-                    beautify: false,
-                    compress: false,
-                    mangle: false
+                    sourceMapIn: 'build/temp/dash.all.debug.js.map'
                 },
                 files: {
-                    'build/temp/dash.externals.debug.js': 'externals/*.js'
+                    'build/temp/dash.all.min.js': 'build/temp/dash.all.debug.js'
                 }
-            }
+            },
+
         },
         copy: {
             dist: {
                 expand: true,
                 cwd: 'build/temp/',
                 src: [
                     'dash.all.min.js', 'dash.all.min.js.map',
-                    'dash.externals.min.js', 'dash.externals.min.js.map',
                     'dash.mediaplayer.min.js', 'dash.mediaplayer.min.js.map',
                     'dash.protection.min.js', 'dash.protection.min.js.map',
-                    'dash.no-externals.debug.js', 'dash.no-externals.debug.js.map',
-                    'dash.externals.debug.js', 'dash.externals.debug.js.map',
                     'dash.mediaplayer.debug.js', 'dash.mediaplayer.debug.js.map',
                     'dash.protection.debug.js', 'dash.protection.debug.js.map'
                 ],
@@ -96,12 +76,6 @@ module.exports = function (grunt) {
             }
         },
         exorcise: {
-            no_externals: {
-                options: {},
-                files: {
-                    'build/temp/dash.no-externals.debug.js.map': ['build/temp/dash.no-externals.debug.js']
-                }
-            },
             mediaplayer: {
                 options: {},
                 files: {
@@ -113,6 +87,12 @@ module.exports = function (grunt) {
                 files: {
                     'build/temp/dash.protection.debug.js.map': ['build/temp/dash.protection.debug.js']
                 }
+            },
+            all: {
+                options: {},
+                files: {
+                    'build/temp/dash.all.debug.js.map': ['build/temp/dash.all.debug.js']
+                }
             }
         },
         browserify: {
@@ -148,7 +128,7 @@ module.exports = function (grunt) {
             },
             all: {
                 files: {
-                    'build/temp/dash.no-externals.debug.js': ['src/All.js']
+                    'build/temp/dash.all.debug.js': ['src/All.js']
                 },
                 options: {
                     browserifyOptions: {

externals/objectiron.js

@@ -212,3 +212,5 @@ function ObjectIron(map) {
         run: performMapping
     };
 }
+
+export default ObjectIron;

externals/xml2json.js

@@ -414,3 +414,4 @@ function X2JS(matchers, attrPrefix, ignoreRoot) {
 		escapeMode = enabled;
 	}
 }
+export default X2JS;

package.json

@@ -38,6 +38,9 @@
     "time-grunt": "^1.2.0",
     "uglify-js": "^2.4.21"
   },
+  "dependencies": {
+    "codem-isoboxer": "0.2.1"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Dash-Industry-Forum/dash.js.git"

src/dash/DashParser.js

@@ -31,6 +31,8 @@
 import ErrorHandler from '../streaming/ErrorHandler.js';
 import FactoryMaker from '../core/FactoryMaker.js';
 import Debug from '../core/Debug.js';
+import ObjectIron from '../../externals/objectiron.js';
+import X2JS from '../../externals/xml2json.js';
 
 function DashParser(/*config*/) {
 

src/streaming/TTMLParser.js

@@ -29,6 +29,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 import FactoryMaker from '../core/FactoryMaker.js';
+import X2JS from '../../externals/xml2json.js';
 
 const SECONDS_IN_HOUR = 60 * 60; // Expression of an hour in seconds
 const SECONDS_IN_MIN = 60; // Expression of a minute in seconds

src/streaming/controllers/XlinkController.js

@@ -31,6 +31,7 @@
 import EventBus from '../../core/EventBus.js';
 import Events from '../../core/events/Events.js';
 import FactoryMaker from '../../core/FactoryMaker.js';
+import X2JS from '../../../externals/xml2json.js';
 
 const RESOLVE_TYPE_ONLOAD = 'onLoad';
 const RESOLVE_TYPE_ONACTUATE = 'onActuate';

src/streaming/protection/CommonEncryption.js

@@ -29,6 +29,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
+import BASE64 from '../../../externals/base64.js';
+
 class CommonEncryption {
     /**
      * Find and return the ContentProtection element in the given array

src/streaming/protection/drm/KeySystemPlayReady.js

@@ -39,6 +39,7 @@ import CommonEncryption from '../CommonEncryption.js';
 import Error from '../../vo/Error.js';
 
 import FactoryMaker from '../../../core/FactoryMaker.js';
+import BASE64 from '../../../../externals/base64.js';
 
 const uuid = '9a04f079-9840-4286-ab92-e65be0885f95';
 const systemString = 'com.microsoft.playready';

src/streaming/protection/servers/DRMToday.js

@@ -36,6 +36,7 @@
  * @class
  */
 import FactoryMaker from '../../../core/FactoryMaker.js';
+import BASE64 from '../../../../externals/base64.js';
 
 function DRMToday() {
 

src/streaming/utils/BoxParser.js

@@ -31,6 +31,7 @@
 
 import IsoFile from './IsoFile.js';
 import FactoryMaker from '../../core/FactoryMaker.js';
+import ISOBoxer from 'codem-isoboxer';
 
 function BoxParser(/*config*/) {