github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:elastic/kibana into feature/hapi-server

Browse source
This commit is contained in:
Chris Cowan 2015-06-08 17:04:48 -07:00
commit a7f424eec5
6 changed files with 255 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

395
npm-shrinkwrap.json generated
View file

File diff suppressed because it is too large Load diff

8
package.json
View file

@ -17,7 +17,7 @@
"bugs": {
"url": "http://github.com/elastic/kibana/issues"
},
"license": "Apache 2.0",
"license": "Apache-2.0",
"author": "Rashid Khan <rashid.khan@elastic.co>",
"contributors": [
"Spencer Alger <spencer.alger@elastic.co>",
@ -76,10 +76,9 @@
"devDependencies": {
"bower": "^1.4.1",
"bower-license": "^0.2.6",
"connect": "^2.19.5",
"event-stream": "^3.1.5",
"expect.js": "^0.3.1",
"glob": "^4.1.3",
"jade": "^1.8.2",
"grunt": "^0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-clean": "^0.5.0",
@ -90,7 +89,7 @@
"grunt-contrib-less": "^0.10.0",
"grunt-contrib-requirejs": "^0.4.4",
"grunt-contrib-watch": "^0.5.3",
"grunt-esvm": "^0.3.2",
"grunt-esvm": "^0.3.5",
"grunt-jscs": "^1.8.0",
"grunt-mocha": "^0.4.10",
"grunt-replace": "^0.7.9",
@ -103,7 +102,6 @@
"istanbul": "^0.2.4",
"license-checker": "3.0.3",
"load-grunt-config": "^0.7.0",
"lodash": "^2.4.1",
"marked": "^0.3.2",
"marked-text-renderer": "^0.1.0",
"mkdirp": "^0.5.0",

2
src/kibana/components/vislib/lib/chart_title.js
View file

@ -21,7 +21,7 @@ define(function (require) {
this.el = el;
this.tooltip = new Tooltip('chart-title', el, function (d) {
return '<p>' + d.label + '</p>';
return '<p>' + _.escape(d.label) + '</p>';
});
}

12
src/kibana/components/vislib/lib/legend.js
View file

@ -78,9 +78,15 @@ define(function (require) {
.enter()
.append('li')
.attr('class', 'color')
.each(self._addIdentifier)
.html(function (d) {
return '<i class="fa fa-circle dots" style="color:' + args.color(d) + '"></i>' + d;
.each(function (label) {
var li = d3.select(this);
self._addIdentifier.call(this, label);
li.append('i')
.attr('class', 'fa fa-circle dots')
.attr('style', 'color:' + args.color(label));
li.append('span').text(label);
});
};

2
src/kibana/components/vislib/visualizations/tile_map.js
View file

@ -655,7 +655,7 @@ define(function (require) {
return this._div;
};
label.update = function () {
this._div.innerHTML = '<h2>' + mapLabel + '</h2>';
this._div.innerHTML = '<h2>' + _.escape(mapLabel) + '</h2>';
};
label.addTo(map);
};

2
tasks/licenses.js
View file

@ -17,7 +17,7 @@ module.exports = function (grunt) {
function processPackage(info, dependency) {
var pkgInfo = {};
pkgInfo.name = dependency;
pkgInfo.licenses = config.overrides[dependency] || info.licenses;
pkgInfo.licenses = config.overrides[dependency] || (info && info.licenses);
pkgInfo.licenses = _.isArray(pkgInfo.licenses) ? pkgInfo.licenses : [pkgInfo.licenses];
pkgInfo.valid = (function () {
if (_.intersection(pkgInfo.licenses, config.licenses).length > 0) {