diff options
| author | Juuso Lapinlampi <wub@partyvan.eu> | 2016-01-17 17:30:32 +0100 |
|---|---|---|
| committer | Juuso Lapinlampi <wub@partyvan.eu> | 2016-01-17 17:30:32 +0100 |
| commit | ea556b08cadb5c3459f0029eefcbd8575d6173e5 (patch) | |
| tree | 179300553404f10571001476a8f00965a43e3828 /Gruntfile.js | |
| parent | 4dbb7930b80f7af0307922544ea9b3ccab99cb2c (diff) | |
| parent | 6187651a09fcd8dcdc4e3caeed6248433bbfdcbc (diff) | |
Merge branch 'luminarys/vanilla-js' from WubTheCaptain
Replaces js/pomf.js and its dependencies with Luminarys' new js/app.js,
written in vanilla JavaScript with no dependencies required. This should
improve browser backwards compatibility.
Includes patches from wub@ to add Luminarys to package.json contributors
and adding the proper copyright header to js/app.js.
Luminarys' original code had removed an unused CSS property from
css/pomf.css. I reverted this change to merge it later as a seperate
fix, to be able to merge it properly to the maint branch.
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 7e01c96..14c167f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -33,10 +33,7 @@ module.exports = function (grunt) { dist: { files: { 'dist/pomf.min.js': [ - 'js/zepto.js', - 'js/cheesesteak.js', - 'js/cabinet.js', - 'js/pomf.js' + 'js/app.js' ] } } |
