mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 01:38:56 -04:00
Merge pull request #6015 from michaelcheng429/typos
minor copy improvements (typos)
This commit is contained in:
commit
2c1ffd627c
7 changed files with 20 additions and 20 deletions
|
@ -60,11 +60,11 @@ define(function (require) {
|
|||
};
|
||||
|
||||
$scope.toggleDisplay = function (field) {
|
||||
// inheritted param to fieldChooser
|
||||
// This is inherited from fieldChooser
|
||||
$scope.toggle(field.name);
|
||||
if (field.display) $scope.increaseFieldCounter(field);
|
||||
|
||||
// we are now displaying the field, kill it's details
|
||||
// we are now displaying the field, kill its details
|
||||
if (field.details) {
|
||||
$scope.toggleDetails(field);
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
<!-- Settings editors -->
|
||||
<form
|
||||
name="forms.configEdit"
|
||||
ng-if="conf.editting"
|
||||
ng-if="conf.editing"
|
||||
ng-submit="save(conf)"
|
||||
role="form">
|
||||
|
||||
|
@ -65,7 +65,7 @@
|
|||
</form>
|
||||
|
||||
<!-- Setting display formats -->
|
||||
<span ng-if="!conf.editting" data-test-subj="currentValue">
|
||||
<span ng-if="!conf.editing" data-test-subj="currentValue">
|
||||
<span ng-show="(conf.normal || conf.json || conf.select)">{{conf.value || conf.defVal}}</span>
|
||||
<span ng-show="conf.array">{{(conf.value || conf.defVal).join(', ')}}</span>
|
||||
<span ng-show="conf.bool">{{conf.value === undefined ? conf.defVal : conf.value}}</span>
|
||||
|
@ -74,7 +74,7 @@
|
|||
</td>
|
||||
<td class="actions">
|
||||
<button
|
||||
ng-if="!conf.editting"
|
||||
ng-if="!conf.editing"
|
||||
ng-click="edit(conf)"
|
||||
class="btn btn-default"
|
||||
ng-disabled="conf.tooComplex"
|
||||
|
@ -85,7 +85,7 @@
|
|||
</button>
|
||||
|
||||
<button
|
||||
ng-if="conf.editting"
|
||||
ng-if="conf.editing"
|
||||
ng-click="save(conf)"
|
||||
class="btn btn-success"
|
||||
ng-disabled="conf.loading || conf.tooComplex || forms.configEdit.$invalid"
|
||||
|
@ -97,7 +97,7 @@
|
|||
</button>
|
||||
|
||||
<button
|
||||
ng-if="!conf.editting"
|
||||
ng-if="!conf.editing"
|
||||
ng-click="clear(conf)"
|
||||
ng-hide="conf.value === undefined"
|
||||
class="btn btn-danger"
|
||||
|
@ -108,7 +108,7 @@
|
|||
</button>
|
||||
|
||||
<button
|
||||
ng-if="conf.editting"
|
||||
ng-if="conf.editing"
|
||||
ng-click="cancelEdit(conf)"
|
||||
class="btn btn-default"
|
||||
aria-label="Cancel edit"
|
||||
|
|
|
@ -22,12 +22,12 @@ define(function (require) {
|
|||
// To allow passing form validation state back
|
||||
$scope.forms = {};
|
||||
|
||||
// setup loading flag, run async op, then clear loading and editting flag (just in case)
|
||||
// setup loading flag, run async op, then clear loading and editing flag (just in case)
|
||||
var loading = function (conf, fn) {
|
||||
conf.loading = true;
|
||||
fn()
|
||||
.finally(function () {
|
||||
conf.loading = conf.editting = false;
|
||||
conf.loading = conf.editing = false;
|
||||
})
|
||||
.catch(notify.fatal);
|
||||
};
|
||||
|
@ -41,7 +41,7 @@ define(function (require) {
|
|||
$scope.edit = function (conf) {
|
||||
conf.unsavedValue = conf.value == null ? conf.defVal : conf.value;
|
||||
$scope.configs.forEach(function (c) {
|
||||
c.editting = (c === conf);
|
||||
c.editing = (c === conf);
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -56,7 +56,7 @@ define(function (require) {
|
|||
};
|
||||
|
||||
$scope.cancelEdit = function (conf) {
|
||||
conf.editting = false;
|
||||
conf.editing = false;
|
||||
};
|
||||
|
||||
$scope.clear = function (conf) {
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<h5>
|
||||
Index Patterns
|
||||
<a
|
||||
ng-if="edittingId"
|
||||
ng-if="editingId"
|
||||
href="#/settings/indices"
|
||||
class="btn btn-primary btn-xs"
|
||||
aria-label="Add New">
|
||||
|
|
|
@ -23,7 +23,7 @@ define(function (require) {
|
|||
transclude: true,
|
||||
template: require('plugins/kibana/settings/sections/indices/index.html'),
|
||||
link: function ($scope) {
|
||||
$scope.edittingId = $route.current.params.indexPatternId;
|
||||
$scope.editingId = $route.current.params.indexPatternId;
|
||||
config.$bind($scope, 'defaultIndex');
|
||||
|
||||
$scope.$watch('defaultIndex', function () {
|
||||
|
@ -32,7 +32,7 @@ define(function (require) {
|
|||
return {
|
||||
id: id,
|
||||
url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}),
|
||||
class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''),
|
||||
class: 'sidebar-item-title ' + ($scope.editingId === id ? 'active' : ''),
|
||||
default: $scope.defaultIndex === id
|
||||
};
|
||||
});
|
||||
|
|
|
@ -23,7 +23,7 @@ define(function (require) {
|
|||
self.fetch();
|
||||
}),
|
||||
|
||||
// begining of full route update, new app will be initialized before
|
||||
// beginning of full route update, new app will be initialized before
|
||||
// $routeChangeSuccess or $routeChangeError
|
||||
$rootScope.$on('$routeChangeStart', function () {
|
||||
if (self._persistAcrossApps) {
|
||||
|
@ -136,8 +136,8 @@ define(function (require) {
|
|||
* @returns {void}
|
||||
*/
|
||||
State.prototype.destroy = function () {
|
||||
this.off(); // removes all listners
|
||||
this._cleanUpListeners(); // Removes the $routeUpdate listner
|
||||
this.off(); // removes all listeners
|
||||
this._cleanUpListeners(); // Removes the $routeUpdate listener
|
||||
};
|
||||
|
||||
State.prototype.setDefaults = function (defaults) {
|
||||
|
|
|
@ -88,9 +88,9 @@ define(function (require) {
|
|||
/**
|
||||
* Return the current bounds, if we have any.
|
||||
*
|
||||
* THIS DOES NOT CLONE THE BOUNDS, so editting them
|
||||
* THIS DOES NOT CLONE THE BOUNDS, so editing them
|
||||
* may have unexpected side-effects. Always
|
||||
* call bounds.min.clone() before editting
|
||||
* call bounds.min.clone() before editing
|
||||
*
|
||||
* @return {object|undefined} - If bounds are not defined, this
|
||||
* returns undefined, else it returns the bounds
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue