Merge pull request #693 from aholachek/es5

added es5 shim to project, not just tests
adsabs · Dec 3, 2015 · 07911dc · 07911dc
2 parents c7de377 + de2207a
commit 07911dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -28,15 +28,15 @@
     "requirejs": "~2.1.8",
     "requirejs-plugins": "~1.0.3",
     "select2": "3.5.4",
-    "clipboard": "~1.4.0"
+    "clipboard": "~1.4.0",
+    "es5-shim": "~4.0.3"
   },
   "devDependencies": {
     "chai": "~1.8.0",
     "qunit": "~1.12.0",
     "jasmine": "~1.3.1",
     "mocha": "~2.1.0",
     "sinon": "http://sinonjs.org/releases/sinon-1.9.0.js",
-    "es5-shim": "~4.0.3",
     "sprintf": "~1.0.2",
     "squire": "~0.2.0"
   },

diff --git a/src/discovery.config.js b/src/discovery.config.js
@@ -190,7 +190,8 @@ require.config({
     'filesaver' : 'libs/FileSaver/FileSaver',
     'select2' : 'libs/select2/select2',
     'squire': '../bower_components/squire/src/Squire',
-    'clipboard': 'libs/clipboard/clipboard'
+    'clipboard': 'libs/clipboard/clipboard',
+    'es5-shim' : 'libs/es5-shim/es5-shim'
 
   },
 

diff --git a/src/js/apps/discovery/main.js b/src/js/apps/discovery/main.js
@@ -19,7 +19,8 @@ define(['config', 'module'], function(config, module) {
       'router',
       'js/components/application',
       'js/mixins/discovery_bootstrap',
-      'js/mixins/api_access'
+      'js/mixins/api_access',
+      'es5-shim'
     ],
     function(Router,
       Application,