freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[TASK] Update bower components

Browse source
This commit is contained in:
Xaver Maierhofer 2016-05-22 15:58:09 +02:00 committed by Milan Pässler
parent 04eb8f039b
commit 6aec0b21a8
7 changed files with 30 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Gruntfile.js
View file

@ -1,23 +1,7 @@
module.exports = function (grunt) { module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-git-describe");
grunt.initConfig({
"git-describe": {
options: {},
default: {}
}
});
grunt.registerTask("saveRevision", function () {
grunt.event.once("git-describe", function (rev) {
grunt.option("gitRevision", rev);
});
grunt.task.run("git-describe");
});
grunt.loadTasks("tasks"); grunt.loadTasks("tasks");
grunt.registerTask("default", ["bower-install-simple", "lint", "saveRevision", "copy", "sass", "postcss", "requirejs"]); grunt.registerTask("default", ["bower-install-simple", "lint", "copy", "sass", "postcss", "requirejs"]);
grunt.registerTask("lint", ["eslint"]); grunt.registerTask("lint", ["eslint"]);
grunt.registerTask("dev", ["default", "connect:server", "watch"]); grunt.registerTask("dev", ["default", "connect:server", "watch"]);
}; };

4
app.js
View file

@ -8,7 +8,7 @@ require.config({
"moment": "../bower_components/moment/min/moment.min", "moment": "../bower_components/moment/min/moment.min",
"moment.de": "../bower_components/moment/locale/de", "moment.de": "../bower_components/moment/locale/de",
"tablesort": "../bower_components/tablesort/tablesort.min", "tablesort": "../bower_components/tablesort/tablesort.min",
"tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric", "tablesort.number": "../bower_components/tablesort/src/sorts/tablesort.number",
"d3": "../bower_components/d3/d3.min", "d3": "../bower_components/d3/d3.min",
"numeral": "../bower_components/numeraljs/min/numeral.min", "numeral": "../bower_components/numeraljs/min/numeral.min",
"numeral-intl": "../bower_components/numeraljs/min/languages.min", "numeral-intl": "../bower_components/numeraljs/min/languages.min",
@ -28,7 +28,7 @@ require.config({
deps: ["numeral"], deps: ["numeral"],
exports: "numeral" exports: "numeral"
}, },
"tablesort.numeric": ["tablesort"], "tablesort.number": ["tablesort"],
"helper": ["numeral-intl"] "helper": ["numeral-intl"]
} }
}); });

23
bower.json
View file

@ -9,21 +9,20 @@
], ],
"dependencies": { "dependencies": {
"Leaflet.label": "~0.2.1", "Leaflet.label": "~0.2.1",
"chroma-js": "~0.6.1", "chroma-js": "~1.1.1",
"leaflet": "~0.7.3", "leaflet": "~0.7.7",
"moment": "~2.9.0", "moment": "~2.13.0",
"requirejs": "~2.1.16", "requirejs": "~2.2.0",
"tablesort": "https://github.com/tristen/tablesort.git#v3.0.2", "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1",
"roboto-slab-fontface": "*", "roboto-slab-fontface": "*",
"es6-shim": "~0.27.1", "es6-shim": "~0.35.1",
"almond": "~0.3.1", "almond": "~0.3.2",
"r.js": "~2.1.16", "d3": "~3.5.17",
"d3": "~3.5.5",
"numeraljs": "~1.5.3", "numeraljs": "~1.5.3",
"roboto-fontface": "~0.3.0", "roboto-fontface": "~0.3.0",
"virtual-dom": "~2.0.1", "virtual-dom": "~2.1.1",
"leaflet-providers": "~1.0.27", "leaflet-providers": "~1.1.10",
"rbush": "https://github.com/mourner/rbush.git#~1.3.5", "rbush": "https://github.com/mourner/rbush.git#~1.4.3",
"jshashes": "~1.0.5" "jshashes": "~1.0.5"
}, },
"authors": [ "authors": [

2
lib/gui.js
View file

@ -10,7 +10,7 @@ define(["chroma-js", "map", "sidebar", "tabs", "container", "meshstats",
var content; var content;
var contentDiv; var contentDiv;
var linkScale = chroma.scale(chroma.interpolate.bezier(["#04C714", "#FF5500", "#F02311"])).domain([1, 5]); var linkScale = chroma.scale(chroma.bezier(["#04C714", "#FF5500", "#F02311"])).domain([1, 5]);
var sidebar; var sidebar;
var buttons = document.createElement("div"); var buttons = document.createElement("div");

2
lib/infobox/node.js
View file

@ -1,4 +1,4 @@
define(["moment", "numeral", "tablesort", "tablesort.numeric", "moment.de"], define(["moment", "numeral", "tablesort", "tablesort.number", "moment.de"],
function (moment, numeral, Tablesort) { function (moment, numeral, Tablesort) {
function showGeoURI(d) { function showGeoURI(d) {
function showLatitude(d) { function showLatitude(d) {

29
package.json
View file

@ -4,21 +4,20 @@
"test": "node -e \"require('grunt').cli()\" '' clean lint" "test": "node -e \"require('grunt').cli()\" '' clean lint"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.3.3", "autoprefixer": "^6.3.6",
"grunt": "^0.4.5", "grunt": "^1.0.1",
"grunt-check-dependencies": "^0.6.0", "grunt-bower-install-simple": "^1.2.1",
"grunt-contrib-clean": "^0.6.0", "grunt-check-dependencies": "^0.12.0",
"grunt-contrib-connect": "^0.8.0", "grunt-contrib-clean": "^1.0.0",
"grunt-contrib-copy": "^0.5.0", "grunt-contrib-connect": "^1.0.2",
"grunt-contrib-cssmin": "^0.12.2", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-requirejs": "^0.4.4", "grunt-contrib-cssmin": "^1.0.1",
"grunt-sass": "^1.1.0", "grunt-contrib-requirejs": "^1.0.0",
"grunt-postcss": "^0.7.2", "grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-uglify": "^0.5.1", "grunt-contrib-watch": "^1.0.0",
"grunt-contrib-watch": "^0.6.1", "grunt-eslint": "^18.1.0",
"grunt-eslint": "^10.0.0", "grunt-postcss": "^0.8.0",
"grunt-bower-install-simple": "^1.1.2", "grunt-sass": "^1.2.0"
"grunt-git-describe": "^2.3.2"
}, },
"eslintConfig": { "eslintConfig": {
"env": { "env": {

5
tasks/build.js
View file

@ -3,11 +3,6 @@ module.exports = function (grunt) {
bowerdir: "bower_components", bowerdir: "bower_components",
copy: { copy: {
html: { html: {
options: {
process: function (content) {
return content.replace("#revision#", grunt.option("gitRevision"));
}
},
src: ["*.html"], src: ["*.html"],
expand: true, expand: true,
cwd: "html/", cwd: "html/",