[TASK] Update bower components
This commit is contained in:
parent
04eb8f039b
commit
6aec0b21a8
18
Gruntfile.js
18
Gruntfile.js
|
@ -1,23 +1,7 @@
|
|||
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.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("dev", ["default", "connect:server", "watch"]);
|
||||
};
|
||||
|
|
4
app.js
4
app.js
|
@ -8,7 +8,7 @@ require.config({
|
|||
"moment": "../bower_components/moment/min/moment.min",
|
||||
"moment.de": "../bower_components/moment/locale/de",
|
||||
"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",
|
||||
"numeral": "../bower_components/numeraljs/min/numeral.min",
|
||||
"numeral-intl": "../bower_components/numeraljs/min/languages.min",
|
||||
|
@ -28,7 +28,7 @@ require.config({
|
|||
deps: ["numeral"],
|
||||
exports: "numeral"
|
||||
},
|
||||
"tablesort.numeric": ["tablesort"],
|
||||
"tablesort.number": ["tablesort"],
|
||||
"helper": ["numeral-intl"]
|
||||
}
|
||||
});
|
||||
|
|
23
bower.json
23
bower.json
|
@ -9,21 +9,20 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"Leaflet.label": "~0.2.1",
|
||||
"chroma-js": "~0.6.1",
|
||||
"leaflet": "~0.7.3",
|
||||
"moment": "~2.9.0",
|
||||
"requirejs": "~2.1.16",
|
||||
"tablesort": "https://github.com/tristen/tablesort.git#v3.0.2",
|
||||
"chroma-js": "~1.1.1",
|
||||
"leaflet": "~0.7.7",
|
||||
"moment": "~2.13.0",
|
||||
"requirejs": "~2.2.0",
|
||||
"tablesort": "https://github.com/tristen/tablesort.git#v4.0.1",
|
||||
"roboto-slab-fontface": "*",
|
||||
"es6-shim": "~0.27.1",
|
||||
"almond": "~0.3.1",
|
||||
"r.js": "~2.1.16",
|
||||
"d3": "~3.5.5",
|
||||
"es6-shim": "~0.35.1",
|
||||
"almond": "~0.3.2",
|
||||
"d3": "~3.5.17",
|
||||
"numeraljs": "~1.5.3",
|
||||
"roboto-fontface": "~0.3.0",
|
||||
"virtual-dom": "~2.0.1",
|
||||
"leaflet-providers": "~1.0.27",
|
||||
"rbush": "https://github.com/mourner/rbush.git#~1.3.5",
|
||||
"virtual-dom": "~2.1.1",
|
||||
"leaflet-providers": "~1.1.10",
|
||||
"rbush": "https://github.com/mourner/rbush.git#~1.4.3",
|
||||
"jshashes": "~1.0.5"
|
||||
},
|
||||
"authors": [
|
||||
|
|
|
@ -10,7 +10,7 @@ define(["chroma-js", "map", "sidebar", "tabs", "container", "meshstats",
|
|||
var content;
|
||||
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 buttons = document.createElement("div");
|
||||
|
|
|
@ -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 showGeoURI(d) {
|
||||
function showLatitude(d) {
|
||||
|
|
29
package.json
29
package.json
|
@ -4,21 +4,20 @@
|
|||
"test": "node -e \"require('grunt').cli()\" '' clean lint"
|
||||
},
|
||||
"devDependencies": {
|
||||
"autoprefixer": "^6.3.3",
|
||||
"grunt": "^0.4.5",
|
||||
"grunt-check-dependencies": "^0.6.0",
|
||||
"grunt-contrib-clean": "^0.6.0",
|
||||
"grunt-contrib-connect": "^0.8.0",
|
||||
"grunt-contrib-copy": "^0.5.0",
|
||||
"grunt-contrib-cssmin": "^0.12.2",
|
||||
"grunt-contrib-requirejs": "^0.4.4",
|
||||
"grunt-sass": "^1.1.0",
|
||||
"grunt-postcss": "^0.7.2",
|
||||
"grunt-contrib-uglify": "^0.5.1",
|
||||
"grunt-contrib-watch": "^0.6.1",
|
||||
"grunt-eslint": "^10.0.0",
|
||||
"grunt-bower-install-simple": "^1.1.2",
|
||||
"grunt-git-describe": "^2.3.2"
|
||||
"autoprefixer": "^6.3.6",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-bower-install-simple": "^1.2.1",
|
||||
"grunt-check-dependencies": "^0.12.0",
|
||||
"grunt-contrib-clean": "^1.0.0",
|
||||
"grunt-contrib-connect": "^1.0.2",
|
||||
"grunt-contrib-copy": "^1.0.0",
|
||||
"grunt-contrib-cssmin": "^1.0.1",
|
||||
"grunt-contrib-requirejs": "^1.0.0",
|
||||
"grunt-contrib-uglify": "^1.0.1",
|
||||
"grunt-contrib-watch": "^1.0.0",
|
||||
"grunt-eslint": "^18.1.0",
|
||||
"grunt-postcss": "^0.8.0",
|
||||
"grunt-sass": "^1.2.0"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"env": {
|
||||
|
|
|
@ -3,11 +3,6 @@ module.exports = function (grunt) {
|
|||
bowerdir: "bower_components",
|
||||
copy: {
|
||||
html: {
|
||||
options: {
|
||||
process: function (content) {
|
||||
return content.replace("#revision#", grunt.option("gitRevision"));
|
||||
}
|
||||
},
|
||||
src: ["*.html"],
|
||||
expand: true,
|
||||
cwd: "html/",
|
||||
|
|
Loading…
Reference in a new issue