zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gruntfile

Browse Source
pull/11022/head
Carlos Matallín 8 years ago
parent edb8afbe2d ec55a7d731
commit 6d76e425b4
5 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
Gruntfile.js
Unescape View File

@ -260,7 +260,7 @@
registerCmdTask('npm-test', {cmd: 'npm', args: ['test']});
registerCmdTask('npm-test-watch', {cmd: 'npm', args: ['run', 'test-watch']});
grunt.registerTask('pre_client', ['copy:js_core', 'copy:js_core', 'copy:js_core', 'copy:js_client']);
grunt.registerTask('pre_client', ['copy:locale_core', 'copy:locale_client', 'copy:js_core', 'copy:js_client']);
grunt.registerTask('js', ['cdb', 'pre_client', 'browserify', 'concat:js', 'jst']);
grunt.registerTask('pre_default', ['clean', 'config', 'js']);
grunt.registerTask('test', '(CI env) Re-build JS files and run all tests. ' +

1
lib/assets/locale/es.json
Unescape View File

@ -1,5 +1,4 @@
{
"feedback": "Danos tu opinión!",
"editor": {
"map": "mapa",
"map_name": "%{name} mapa",

4
lib/assets/test/spec/cartodb3/components/form-components/editors/fill/input-color/input-categories/input-color-categories.spec.js
Unescape View File

@ -181,13 +181,13 @@ describe('components/form-components/editors/fill/input-color/input-ramps/input-
expect(this.view.$('.RampItem-bar').length).toBe(3);
expect(this.view.$('.js-listItem:eq(0)').text()).toContain('form-components.editors.fill.input-categories.null');
expect(this.view.$('.RampItem-bar:eq(0)').css('background-color')).toBe('rgb(91, 63, 149)');
expect(this.view.$('.RampItem-bar:eq(0)').css('background-color')).toBe('rgb(95, 70, 144)');
expect(this.view.$('.js-listItem:eq(1)').text()).toContain('one');
expect(this.view.$('.RampItem-bar:eq(1)').css('background-color')).toBe('rgb(29, 105, 150)');
expect(this.view.$('.js-listItem:eq(2)').text()).toContain('two');
expect(this.view.$('.RampItem-bar:eq(2)').css('background-color')).toBe('rgb(18, 156, 99)');
expect(this.view.$('.RampItem-bar:eq(2)').css('background-color')).toBe('rgb(56, 166, 165)');
});
afterEach(function () {

78
npm-shrinkwrap.json generated
Unescape View File

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.5.56",
"version": "4.5.60",
"dependencies": {
"backbone": {
"version": "1.2.3",
@ -472,9 +472,9 @@
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
},
"tweetnacl": {
"version": "0.14.4",
"version": "0.14.5",
"from": "tweetnacl@>=0.14.0 <0.15.0",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.4.tgz"
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
},
"jodid25519": {
"version": "1.0.2",
@ -1133,9 +1133,9 @@
}
},
"cartocolor": {
"version": "3.0.0",
"from": "cartocolor@3.0.0",
"resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-3.0.0.tgz",
"version": "4.0.0",
"from": "cartocolor@4.0.0",
"resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-4.0.0.tgz",
"dependencies": {
"colorbrewer": {
"version": "1.0.0",
@ -1147,12 +1147,12 @@
"cartodb-deep-insights.js": {
"version": "0.0.2",
"from": "cartodb/deep-insights.js#master",
"resolved": "git://github.com/cartodb/deep-insights.js.git#ff0950ea359ecf5778901608fbcb66591e4c8688",
"resolved": "git://github.com/cartodb/deep-insights.js.git#22a735f4324af216fa70683626504ef6585e28d1",
"dependencies": {
"cartodb.js": {
"version": "4.0.0-alpha.1",
"from": "cartodb/cartodb.js#v4",
"resolved": "git://github.com/cartodb/cartodb.js.git#dde385b5d87454f64eb245d8a57ff9b59fe14435",
"resolved": "git://github.com/cartodb/cartodb.js.git#55a4ba92981c9fc295af37507a843966e8447d0a",
"dependencies": {
"backbone-poller": {
"version": "1.1.3",
@ -1160,9 +1160,9 @@
"resolved": "https://registry.npmjs.org/backbone-poller/-/backbone-poller-1.1.3.tgz"
},
"d3.cartodb": {
"version": "1.1.1",
"version": "1.2.1",
"from": "cartodb/d3.cartodb#gh-pages",
"resolved": "git://github.com/cartodb/d3.cartodb.git#9b4047499e80c6a441c2b0230f98b35bcc31caa9",
"resolved": "git://github.com/cartodb/d3.cartodb.git#abbe91d099a6d77fc9ee1d37b770f9bc83cf0a1e",
"dependencies": {
"carto": {
"version": "0.15.1-cdb1",
@ -1199,9 +1199,9 @@
"resolved": "https://registry.npmjs.org/crossfilter/-/crossfilter-1.3.12.tgz"
},
"turbo-carto": {
"version": "0.16.0",
"from": "turbo-carto@0.16.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.16.0.tgz",
"version": "0.19.0",
"from": "turbo-carto@0.19.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz",
"dependencies": {
"colorbrewer": {
"version": "1.0.0",
@ -1286,9 +1286,9 @@
"resolved": "https://registry.npmjs.org/mustache/-/mustache-1.1.0.tgz"
},
"torque.js": {
"version": "2.15.2",
"version": "2.16.1",
"from": "cartodb/torque#master",
"resolved": "git://github.com/cartodb/torque.git#2e1a020c3cc43f0e467ca243d35250f92b8a8dc3",
"resolved": "git://github.com/cartodb/torque.git#16bac52b91bd7b57e020c90a8bffc17e86a2db7b",
"dependencies": {
"carto": {
"version": "0.15.1-cdb1",
@ -1320,9 +1320,9 @@
}
},
"turbo-carto": {
"version": "0.16.0",
"from": "turbo-carto@0.16.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.16.0.tgz",
"version": "0.19.0",
"from": "turbo-carto@0.19.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz",
"dependencies": {
"colorbrewer": {
"version": "1.0.0",
@ -1452,7 +1452,7 @@
"cartodb.js": {
"version": "4.0.0-alpha.1",
"from": "cartodb/cartodb.js#v4",
"resolved": "git://github.com/cartodb/cartodb.js.git#dde385b5d87454f64eb245d8a57ff9b59fe14435",
"resolved": "git://github.com/cartodb/cartodb.js.git#55a4ba92981c9fc295af37507a843966e8447d0a",
"dependencies": {
"backbone-poller": {
"version": "1.1.3",
@ -1465,9 +1465,9 @@
"resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz"
},
"d3.cartodb": {
"version": "1.1.1",
"version": "1.2.1",
"from": "cartodb/d3.cartodb#gh-pages",
"resolved": "git://github.com/cartodb/d3.cartodb.git#9b4047499e80c6a441c2b0230f98b35bcc31caa9",
"resolved": "git://github.com/cartodb/d3.cartodb.git#abbe91d099a6d77fc9ee1d37b770f9bc83cf0a1e",
"dependencies": {
"carto": {
"version": "0.15.1-cdb1",
@ -1504,9 +1504,9 @@
"resolved": "https://registry.npmjs.org/crossfilter/-/crossfilter-1.3.12.tgz"
},
"turbo-carto": {
"version": "0.16.0",
"from": "turbo-carto@0.16.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.16.0.tgz",
"version": "0.19.0",
"from": "turbo-carto@0.19.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz",
"dependencies": {
"colorbrewer": {
"version": "1.0.0",
@ -1591,9 +1591,9 @@
"resolved": "https://registry.npmjs.org/mustache/-/mustache-1.1.0.tgz"
},
"torque.js": {
"version": "2.15.2",
"version": "2.16.1",
"from": "cartodb/torque#master",
"resolved": "git://github.com/cartodb/torque.git#2e1a020c3cc43f0e467ca243d35250f92b8a8dc3",
"resolved": "git://github.com/cartodb/torque.git#16bac52b91bd7b57e020c90a8bffc17e86a2db7b",
"dependencies": {
"carto": {
"version": "0.15.1-cdb1",
@ -1625,9 +1625,9 @@
}
},
"turbo-carto": {
"version": "0.16.0",
"from": "turbo-carto@0.16.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.16.0.tgz",
"version": "0.19.0",
"from": "turbo-carto@0.19.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz",
"dependencies": {
"colorbrewer": {
"version": "1.0.0",
@ -1738,14 +1738,14 @@
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.5.12.tgz",
"dependencies": {
"good-listener": {
"version": "1.2.0",
"version": "1.2.1",
"from": "good-listener@>=1.1.6 <2.0.0",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.0.tgz",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.1.tgz",
"dependencies": {
"delegate": {
"version": "3.1.0",
"from": "delegate@>=3.1.0 <4.0.0",
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.0.tgz"
"version": "3.1.1",
"from": "delegate@>=3.1.1 <4.0.0",
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.1.tgz"
}
}
},
@ -1792,9 +1792,9 @@
"resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.2.1.tgz"
},
"torque.js": {
"version": "2.15.2",
"version": "2.16.1",
"from": "cartodb/torque#master",
"resolved": "git://github.com/cartodb/torque.git#2e1a020c3cc43f0e467ca243d35250f92b8a8dc3",
"resolved": "git://github.com/cartodb/torque.git#16bac52b91bd7b57e020c90a8bffc17e86a2db7b",
"dependencies": {
"carto": {
"version": "0.15.1-cdb1",
@ -1831,9 +1831,9 @@
"resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz"
},
"turbo-carto": {
"version": "0.16.0",
"from": "turbo-carto@0.16.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.16.0.tgz",
"version": "0.19.0",
"from": "turbo-carto@0.19.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz",
"dependencies": {
"colorbrewer": {
"version": "1.0.0",

4
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.5.63",
"version": "4.5.64",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
@ -25,7 +25,7 @@
"cartodb-deep-insights.js": "cartodb/deep-insights.js#master",
"cartodb-pecan": "0.2.x",
"cartodb.js": "cartodb/cartodb.js#v4",
"cartocolor": "3.0.0",
"cartocolor": "4.0.0",
"clipboard": "1.5.12",
"codemirror": "5.14.2",
"jquery": "2.1.4",

Write Preview
Loading…
Cancel
Save