Skip to content
Snippets Groups Projects
Commit 4537f1c8 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge pull request #1280 from metabase/remove_jquery 

Remove jQuery
parents 402ed6ce 07b0008c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
frontend/src/card/card.charting.js
+ 2
− 4
View file @ 4537f1c8
/*global google*/
import _ from "underscore";
import $ from 'jquery';
import crossfilter from 'crossfilter';
import d3 from 'd3';
import dc from 'dc';
......@@ -15,7 +14,6 @@ tip(d3);
// ---------------------------------------- TODO - Maybe. Lots of these things never worked in the first place. ----------------------------------------
// IMPORTANT
// - 'titles' (tooltips)
// - finish removing jQuery
// - tweak padding for labels
//
// LESS IMPORTANT
......@@ -770,7 +768,7 @@ export var CardRenderer = {
if (width !== null) {
el.style.width = width + "px";
}
$(el).trigger('cardrenderer-card-resized');
el.dispatchEvent(new Event("cardrenderer-card-resized"));
}
// dynamically resize the chart if applicable
......@@ -1164,7 +1162,7 @@ export var CardRenderer = {
//listen for resize event (internal to CardRenderer)
//to let google maps api know about the resize
//(see https://developers.google.com/maps/documentation/javascript/reference)
$('#' + id).on('cardrenderer-card-resized', function() {
document.getElementById(id).addEventListener('cardrenderer-card-resized', function() {
google.maps.event.trigger(map, 'resize');
});
},
......
npm-shrinkwrap.json
+ 0
− 124
View file @ 4537f1c8
......@@ -6474,11 +6474,6 @@
"from": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.3.4.tgz",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.3.4.tgz"
},
"jquery": {
"version": "2.1.4",
"from": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz"
},
"karma": {
"version": "0.13.10",
"from": "https://registry.npmjs.org/karma/-/karma-0.13.10.tgz",
......@@ -9104,125 +9099,6 @@
"from": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
},
"ng-annotate-webpack-plugin": {
"version": "0.1.2",
"from": "https://registry.npmjs.org/ng-annotate-webpack-plugin/-/ng-annotate-webpack-plugin-0.1.2.tgz",
"resolved": "https://registry.npmjs.org/ng-annotate-webpack-plugin/-/ng-annotate-webpack-plugin-0.1.2.tgz",
"dependencies": {
"ng-annotate": {
"version": "0.9.11",
"from": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-0.9.11.tgz",
"resolved": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-0.9.11.tgz",
"dependencies": {
"alter": {
"version": "0.2.0",
"from": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz",
"resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz"
},
"convert-source-map": {
"version": "0.4.1",
"from": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.4.1.tgz",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.4.1.tgz"
},
"esprima": {
"version": "1.2.5",
"from": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
},
"optimist": {
"version": "0.6.1",
"from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"dependencies": {
"wordwrap": {
"version": "0.0.3",
"from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
},
"minimist": {
"version": "0.0.10",
"from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
}
}
},
"ordered-ast-traverse": {
"version": "0.1.1",
"from": "https://registry.npmjs.org/ordered-ast-traverse/-/ordered-ast-traverse-0.1.1.tgz",
"resolved": "https://registry.npmjs.org/ordered-ast-traverse/-/ordered-ast-traverse-0.1.1.tgz",
"dependencies": {
"ordered-esprima-props": {
"version": "1.0.0",
"from": "https://registry.npmjs.org/ordered-esprima-props/-/ordered-esprima-props-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/ordered-esprima-props/-/ordered-esprima-props-1.0.0.tgz"
}
}
},
"simple-fmt": {
"version": "0.1.0",
"from": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
"resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz"
},
"simple-is": {
"version": "0.2.0",
"from": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
"resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz"
},
"source-map": {
"version": "0.1.43",
"from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"dependencies": {
"amdefine": {
"version": "1.0.0",
"from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
}
}
},
"stable": {
"version": "0.1.5",
"from": "https://registry.npmjs.org/stable/-/stable-0.1.5.tgz",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.5.tgz"
},
"stringmap": {
"version": "0.2.2",
"from": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
"resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz"
},
"stringset": {
"version": "0.2.1",
"from": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz",
"resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz"
},
"tryor": {
"version": "0.1.2",
"from": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz",
"resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz"
}
}
},
"webpack-core": {
"version": "0.4.8",
"from": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.4.8.tgz",
"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.4.8.tgz",
"dependencies": {
"source-map": {
"version": "0.1.43",
"from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"dependencies": {
"amdefine": {
"version": "1.0.0",
"from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
}
}
}
}
}
}
},
"node-libs-browser": {
"version": "0.5.3",
"from": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.5.3.tgz",
......
package.json
+ 0
− 1
View file @ 4537f1c8
......@@ -26,7 +26,6 @@
"fixed-data-table": "^0.4.7",
"humanize-plus": "^1.5.0",
"inflection": "^1.7.1",
"jquery": "^2.1.4",
"moment": "^2.10.6",
"normalizr": "^0.1.3",
"password-generator": "^2.0.1",
......
webpack.config.js
+ 1
− 2
View file @ 4537f1c8
......@@ -72,7 +72,7 @@ var config = module.exports = {
// { test: /\.css$/, loader: 'style!css!cssnext' }
],
noParse: [
/node_modules\/(angular|ng-|ace|react-onclickoutside|moment|underscore|jquery|d3)/ // doesn't include 'crossfilter', 'dc', and 'tether' due to use of 'require'
/node_modules\/(angular|ng-|ace|react-onclickoutside|moment|underscore|d3)/ // doesn't include 'crossfilter', 'dc', and 'tether' due to use of 'require'
]
},
......@@ -103,7 +103,6 @@ var config = module.exports = {
'moment': __dirname + '/node_modules/moment/min/moment.min.js',
'tether': __dirname + '/node_modules/tether/dist/js/tether.min.js',
'underscore': __dirname + '/node_modules/underscore/underscore-min.js',
'jquery': __dirname + '/node_modules/jquery/dist/jquery.min.js',
'd3': __dirname + '/node_modules/d3/d3.min.js',
'crossfilter': __dirname + '/node_modules/crossfilter/index.js',
'dc': __dirname + '/node_modules/dc/dc.min.js',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment