Merge pull request #20 from slub/providerlogo-javascript

Add sponsor and aggregator logo and other JavaScript improvments
slub · May 7, 2021 · d4aa67f · d4aa67f
2 parents b7288ff + bcaa1d2
commit d4aa67f
Show file tree

Hide file tree

Showing 24 changed files with 3,815 additions and 3,189 deletions.
diff --git a/gruntfile.js → Build/Gruntfile.js b/gruntfile.js → Build/Gruntfile.js
@@ -18,17 +18,25 @@ module.exports = function(grunt) {
                 }
             }
         },
-        uglify: {
+        terser: {
             development: {
                 options: {
                     compress: true,
-                    preserveComments: false,
-                    yuicompress: true,
-                    optimization: 2
+                    output: {
+                        comments: false
+                    }
                 },
                 files: {
-                    "Resources/Public/Javascript/DigitalcollectionsScripts.js" : ['Resources/Private/Javascript/modernizrCustom.js', 'Resources/Private/Javascript/Cookies.js', 'Resources/Private/Javascript/DigitalcollectionsScripts.js'],
-                    "Resources/Public/Javascript/DigitalcollectionsListScripts.js" : ['Resources/Private/Javascript/modernizrCustom.js', 'Resources/Private/Javascript/colcade.js', 'Resources/Private/Javascript/DigitalcollectionsListScripts.js']
+                        "Resources/Public/JavaScript/DigitalcollectionsScripts.js" : [
+                            'Resources/Private/JavaScript/modernizrCustom.js',
+                            'Resources/Private/JavaScript/Cookies.js',
+                            'Resources/Private/JavaScript/DigitalcollectionsScripts.js',
+                        ],
+                        "Resources/Public/JavaScript/DigitalcollectionsListScripts.js" : [
+                            'Resources/Private/JavaScript/modernizrCustom.js',
+                            'Resources/Public/JavaScript/Highlight/colcade.js',
+                            'Resources/Private/JavaScript/DigitalcollectionsListScripts.js',
+                        ],
                 }
             }
         },
@@ -37,14 +45,18 @@ module.exports = function(grunt) {
                 files: ['Resources/Private/Less/**/*.less'],
                 tasks: ['less'],
                 options: {
-                    nospawn: true
+                    spawn: false
                 }
             },
             js: {
-                files: ['Resources/Private/Javascript/*.js'],
-                tasks: ['uglify']
-            }
+                files: ['Resources/Private/JavaScript/*.js'],
+                tasks: ['terser'],
+                options: {
+                    spawn: false
+                }
+            },
         }
     });
-    grunt.registerTask('default', ['less','uglify','watch']);
+    grunt.file.setBase('../')
+    grunt.registerTask('default', ['terser','less','watch']);
 };