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

refactoring: moving components -> core

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-10-30 14:24:04 +01:00
parent 1113081aab
commit 1665cb4282
4 changed files with 28 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/components/require.config.js
View File

@ -3,7 +3,6 @@ require.config({
baseUrl: 'public',
paths: {
settings: 'app/components/settings',
kbn: 'app/components/kbn',
'extend-jquery': 'app/components/extend-jquery',
lodash: 'app/components/lodash.extended',

57
public/app/components/settings.js
View File

@ -1,57 +0,0 @@
define([
'lodash',
],
function (_) {
"use strict";
return function Settings (options) {
/**
* To add a setting, you MUST define a default. Also,
* THESE ARE ONLY DEFAULTS.
* They are overridden by config.js in the root directory
* @type {Object}
*/
var defaults = {
datasources : {},
window_title_prefix : 'Grafana - ',
panels : {
'graph': { path: 'app/panels/graph', name: 'Graph' },
'singlestat': { path: 'app/panels/singlestat', name: 'Single stat' },
'text': { path: 'app/panels/text', name: 'Text' },
'dashlist': { path: 'app/panels/dashlist', name: 'Dashboard list' },
},
new_panel_title: 'no title (click here)',
plugins: {},
default_route: '/dashboard/file/default.json',
playlist_timespan: "1m",
unsaved_changes_warning: true,
search: { max_results: 100 },
appSubUrl: ""
};
var settings = _.extend({}, defaults, options);
// var parseBasicAuth = function(datasource) {
// var passwordEnd = datasource.url.indexOf('@');
// if (passwordEnd > 0) {
// var userStart = datasource.url.indexOf('//') + 2;
// var userAndPassword = datasource.url.substring(userStart, passwordEnd);
// var bytes = crypto.charenc.Binary.stringToBytes(userAndPassword);
// datasource.basicAuth = crypto.util.bytesToBase64(bytes);
//
// var urlHead = datasource.url.substring(0, userStart);
// datasource.url = urlHead + datasource.url.substring(passwordEnd + 1);
// }
//
// return datasource;
// };
//
// _.each(settings.datasources, function(datasource, key) {
// datasource.name = key;
// if (datasource.url) { parseBasicAuth(datasource); }
// if (datasource.type === 'influxdb') { parseMultipleHosts(datasource); }
// });
return settings;
};
});

2
public/app/core/config.js
View File

@ -1,5 +1,5 @@
define([
'settings',
'app/core/settings',
],
function (Settings) {
"use strict";

27
public/app/core/settings.js Normal file
View File

@ -0,0 +1,27 @@
define([
'lodash',
],
function (_) {
"use strict";
return function Settings (options) {
var defaults = {
datasources : {},
window_title_prefix : 'Grafana - ',
panels : {
'graph': { path: 'app/panels/graph', name: 'Graph' },
'singlestat': { path: 'app/panels/singlestat', name: 'Single stat' },
'text': { path: 'app/panels/text', name: 'Text' },
'dashlist': { path: 'app/panels/dashlist', name: 'Dashboard list' },
},
new_panel_title: 'no title (click here)',
plugins: {},
playlist_timespan: "1m",
unsaved_changes_warning: true,
appSubUrl: ""
};
var settings = _.extend({}, defaults, options);
return settings;
};
});