github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:elastic/kibana into apps/home

Browse source
This commit is contained in:
spalger 2015-07-27 10:57:01 -07:00
commit f9f4b0e2c6
4 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
STYLEGUIDE.md
View file

@ -242,7 +242,7 @@ Don't do this. Everything should be wrapped in a module that can be depended on
Prefer the use of function declarations over function expressions. Function expressions are allowed, but should usually be avoided.
Also, keep function definitions above other code instead of relying on function hoising.
Also, keep function definitions above other code instead of relying on function hoisting.
*Preferred:*

11
src/plugins/elasticsearch/lib/upgrade_config.js
View file

@ -27,12 +27,11 @@ module.exports = function (server) {
}
// if we already have a the current version in the index then we need to stop
if (_.find(response.hits.hits, function currentVersion(hit) {
return hit._id !== '@@version' &&
hit._id === config.get('pkg.version');
})) {
return Promise.resolve();
}
var devConfig = _.find(response.hits.hits, function currentVersion(hit) {
return hit._id !== '@@version' && hit._id === config.get('pkg.version');
});
if (devConfig) return Promise.resolve();
// Look for upgradeable configs. If none of them are upgradeable
// then resolve with null.

2
src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html
View file

@ -1,6 +1,6 @@
<div bindonce>
<div class="discover-field-details">
<h5 ng-show="!field.details.error">Quick Count <kbn-info info="Based on documents in the table" placement="right"></kbn-info>
<h5 ng-show="!field.details.error">Quick Count <kbn-info info="Top 5 values based on documents in the table" placement="right"></kbn-info>
<span ng-if="!field.details.error" class="small discover-field-details-count">
(
<a ng-show="field.indexed" ng-click="updateFilterInQuery('_exists_', field.name, '+')">{{field.details.exists}}</a>

23
src/ui/public/directives/saved_object_finder.js
View file

@ -118,16 +118,27 @@ define(function (require) {
//key handler for the filter text box
self.filterKeyDown = function ($event) {
if (keymap[$event.keyCode] !== 'tab') return;
switch (keymap[$event.keyCode]) {
case 'tab':
if (self.hitCount === 0) return;
if (self.hits.length === 0) return;
self.selector.index = 0;
self.selector.enabled = true;
self.selector.index = 0;
self.selector.enabled = true;
selectTopHit();
selectTopHit();
$event.preventDefault();
break;
case 'enter':
if (self.hitCount !== 1) return;
$event.preventDefault();
var hit = self.hits[0];
if (!hit) return;
self.onChoose(hit, $event);
$event.preventDefault();
break;
}
};
//key handler for the list items