IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2286 from awiddersheim/fix/parenthesis_typo

Browse Source 
Fix 'paranthesis' typo to 'parenthesis'
This commit is contained in:
Torkel Ödegaard
2015-07-06 09:03:52 +02:00
parent 42926c48e5 e20e2117f7
commit 90ecb4c544
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/graphite/parser.js
View File

@@ -142,13 +142,13 @@ define([
name: this.consumeToken().value, name: this.consumeToken().value,
}; };
// consume left paranthesis // consume left parenthesis
this.consumeToken(); this.consumeToken();
node.params = this.functionParameters(); node.params = this.functionParameters();
if (!this.match(')')) { if (!this.match(')')) {
this.errorMark('Expected closing paranthesis'); this.errorMark('Expected closing parenthesis');
} }
this.consumeToken(); this.consumeToken();

4
public/test/specs/parser-specs.js
View File

@@ -118,11 +118,11 @@ define([
expect(rootNode.pos).to.be(19); expect(rootNode.pos).to.be(19);
}); });
it('invalid function expression missing closing paranthesis', function() { it('invalid function expression missing closing parenthesis', function() {
var parser = new Parser('sum(test'); var parser = new Parser('sum(test');
var rootNode = parser.getAst(); var rootNode = parser.getAst();
expect(rootNode.message).to.be('Expected closing paranthesis instead found end of string'); expect(rootNode.message).to.be('Expected closing parenthesis instead found end of string');
expect(rootNode.pos).to.be(9); expect(rootNode.pos).to.be(9);
}); });

2
public/vendor/bootstrap/bootstrap.js vendored
View File

@@ -2069,7 +2069,7 @@
, move: function (e) { , move: function (e) {
if (!this.shown) return if (!this.shown) return
// grafana change, shift+left paranthesis // grafana change, shift+left parenthesis
if (e.shiftKey && e.keyCode === 40) { if (e.shiftKey && e.keyCode === 40) {
return; return;
} }