Fix build; update dependencies (opnsense#2)

Author: MichaelDeciso

.gitignore

@@ -7,4 +7,5 @@ src/*.map
 *.diff
 *.patch
 .DS_Store
-settings.json
+settings.json
+.idea/

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.3.3
+### Enhancements & Features
+- Update dependencies to 2018 versions, eliminating 72 vulnerabilities.
+- The old, unused copy of Modernizr in the demo has been removed.
+
+## 1.3.2
+### Bug fixes
+- Fix jQuery and Bootstrap versions in package.json, fix license info in package.json
+
+### Enhancements & Features
+- Use left and right single guillemets in pagination.
+- Migrated test suite to Qunit 2.8.0.
+
 ## 1.3.1
 
 ### Enhancements & Features

Gruntfile.js

@@ -1,6 +1,5 @@
 /*jshint node:true*/
-module.exports = function (grunt)
-{
+module.exports = function (grunt) {
     "use strict";
 
     /* Hint: Using grunt-strip-code to remove comments from the release file */
@@ -9,8 +8,8 @@ module.exports = function (grunt)
         pkg: grunt.file.readJSON('package.json'),
         fontawesome: 'fa',
         banner: '/*! <%= "\\r\\n * " + pkg.title %> v<%= pkg.version %> - <%= grunt.template.today("mm/dd/yyyy") + "\\r\\n" %>' +
-            ' * Copyright (c) 2014-<%= grunt.template.today("yyyy") %> <%= pkg.author.name %> <%= (pkg.homepage ? "(" + pkg.homepage + ")" : "") + "\\r\\n" %>' +
-            ' * Licensed under <%= pkg.licenses[0].type + " " + pkg.licenses[0].url + "\\r\\n */\\r\\n" %>',
+            ' * Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-<%= grunt.template.today("yyyy") %> <%= pkg.author.name %> <%= (pkg.homepage ? "(" + pkg.homepage + ")" : "") + "\\r\\n" %>' +
+            ' * Licensed under the <%= pkg.license + " license. See LICENSE.txt for more details." + "\\r\\n */\\r\\n" %>',
         folders: {
             dist: "dist",
             docs: "docs",
@@ -57,20 +56,17 @@ module.exports = function (grunt)
                     separator: '\r\n\r\n',
                     banner: '<%= banner %>;(function ($, window, undefined)\r\n{\r\n    /*jshint validthis: true */\r\n    "use strict";\r\n\r\n',
                     footer: '\r\n})(jQuery, window);',
-                    process: function(src, filepath)
-                    {
+                    process: function (src, filepath) {
                         var result = src.trim().replace(/(.+?\r\n)/gm, '    $1'),
                             end = [0, ""],
                             lastChar = result[result.length - 1];
 
-                        if (lastChar === ";")
-                        {
+                        if (lastChar === ";") {
                             end = (result[result.length - 2] === ")") ?
-                            (result[result.length - 2] === "}") ?
-                            [3, "    });"] : [2, ");"] : [2, "    };"];
+                                (result[result.length - 2] === "}") ?
+                                    [3, "    });"] : [2, ");"] : [2, "    };"];
                         }
-                        else if (lastChar === "}")
-                        {
+                        else if (lastChar === "}") {
                             end = [1, "    }"];
                         }
 
@@ -106,6 +102,7 @@ module.exports = function (grunt)
             default: {
                 options: {
                     'adjoining-classes': false,
+                    'order-alphabetical': false,
                     'important': false,
                     'outline-none': false,
                     'overqualified-elements': false
@@ -118,13 +115,14 @@ module.exports = function (grunt)
                 curly: true,
                 eqeqeq: true,
                 immed: true,
-                latedef: true,
+                latedef: 'nofunc',
                 newcap: true,
                 noarg: true,
                 sub: true,
                 undef: true,
                 eqnull: true,
                 browser: true,
+                reporterOutput: "",
                 globals: {
                     jQuery: true,
                     $: true,
@@ -210,7 +208,7 @@ module.exports = function (grunt)
                 files: [
                     {
                         flatten: true,
-                        expand: true, 
+                        expand: true,
                         src: ['<%= folders.dist %>/*.js', '<%= folders.dist %>/*.css'], dest: '/'
                     }
                 ]
@@ -247,8 +245,7 @@ module.exports = function (grunt)
     grunt.loadNpmTasks('grunt-nuget');
     grunt.loadNpmTasks('grunt-regex-replace');
 
-    grunt.registerMultiTask('version', 'sets version tag', function ()
-    {
+    grunt.registerMultiTask('version', 'sets version tag', function () {
         var pkg = grunt.file.readJSON(this.data.src);
         pkg["version"] = this.data.options.version;
         grunt.file.write(this.data.src, JSON.stringify(pkg, null, 4));

LICENSE.txt

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Rafael J. Staib
+Copyright © 2014-2015 Rafael J. Staib
+Copyright © 2018 Deciso
 
 Permission is hereby granted, free of charge, to any person obtaining a copy 
 of this software and associated documentation files (the "Software"), to deal 

README.md

@@ -1,4 +1,4 @@
-jQuery Bootgrid Plugin [![Build Status](http://img.shields.io/travis/rstaib/jquery-bootgrid/master.svg?style=flat-square)](https://travis-ci.org/rstaib/jquery-bootgrid) ![Bower version](http://img.shields.io/bower/v/jquery.bootgrid.svg?style=flat-square) ![NuGet version](http://img.shields.io/nuget/v/jquery.bootgrid.svg?style=flat-square) ![NPM version](http://img.shields.io/npm/v/jquery-bootgrid.svg?style=flat-square) ![Gratipay](http://img.shields.io/gratipay/RafaelStaib.svg?style=flat-square)
+jQuery Bootgrid Plugin [![Build Status](http://img.shields.io/travis/opnsense/jquery-bootgrid/master.svg?style=flat-square)](https://travis-ci.org/opnsense/jquery-bootgrid) ![Bower version](http://img.shields.io/bower/v/jquery.bootgrid.svg?style=flat-square) ![NuGet version](http://img.shields.io/nuget/v/jquery.bootgrid.svg?style=flat-square) ![NPM version](http://img.shields.io/npm/v/jquery-bootgrid.svg?style=flat-square) ![Gratipay](http://img.shields.io/gratipay/RafaelStaib.svg?style=flat-square)
 ============
 
 Nice, sleek and intuitive. A grid control especially designed for bootstrap.
@@ -53,10 +53,45 @@ Instructions will follow soon!
 
 I'm always happy to help answer your questions. The best way to get quick answers is to go to [stackoverflow.com](http://stackoverflow.com) and tag your questions always with **jquery-bootgrid**.
 
+## Building
+
+### Environment
+
+jquery-bootgrid uses npm to install its own dependencies, and mono to build a NuGet package.
+
+You should install both using your package manager. On macOS, this works as follows:
+```
+brew install npm
+brew install mono
+```
+
+### Build dependencies
+
+From the folder that jquery-bootgrid resides in, run:
+```
+npm install .
+sudo npm install -g grunt
+```
+
+### Build jquery-bootgrid itself
+```
+grunt
+```
+
+If you are done with your modifications, you should increase the version number in boewer.json and package.json, 
+update the changelog, and then run:
+```
+grunt release
+```
+
+
 ## Contributing
 
-Instructions will follow soon!
+No instructions yet.
 
 ## License
 
-Copyright (c) 2014-2015 Rafael J. Staib Licensed under the [MIT license](https://github.com/rstaib/jquery-bootgrid/blob/master/LICENSE.txt).
+Copyright © 2014-2015 Rafael J. Staib
+Copyright © 2018 Deciso B.V.
+
+Licensed under the [MIT license](https://github.com/opnsense/jquery-bootgrid/blob/master/LICENSE.txt).

bower.json

@@ -13,7 +13,7 @@
         "accessibility",
         "bootstrap"
     ],
-    "version": "1.3.1",
+    "version": "1.3.3",
     "authors": [
         {
             "name": "Rafael Staib",

demo/index.htm

@@ -6,7 +6,6 @@
         <title>jQuery Bootgrid Demo</title>
         <link href="css/bootstrap.css" rel="stylesheet" />
         <link href="../dist/jquery.bootgrid.css" rel="stylesheet" />
-        <script src="js/modernizr-2.8.1.js"></script>
         <style>
             @-webkit-viewport { width: device-width; }
             @-moz-viewport { width: device-width; }
@@ -171,6 +170,7 @@
 
         <footer id="footer">
             © Copyright 2014-2015, Rafael Staib
+            © Copyright 2018 Deciso B.V.
         </footer>
 
         <script src="../lib/jquery-1.11.1.min.js"></script>

demo/js/moderniz.2.8.1.js

@@ -6,7 +6,6 @@
     <title>jQuery Bootgrid Demo</title>
     <link href="css/bootstrap.css" rel="stylesheet" />
     <link href="../dist/jquery.bootgrid.css" rel="stylesheet" />
-    <script src="js/modernizr-2.8.1.js"></script>
     <style>
         @-webkit-viewport {
             width: device-width;
@@ -133,6 +132,7 @@
 
     <footer id="footer">
         © Copyright 2014-2015, Rafael Staib
+        © Copyright 2018 Deciso B.V.
     </footer>
 
     <script src="../lib/jquery-1.11.1.min.js"></script>