Remove rickshaw libs

Rickshaw are not in use any more

Change-Id: If623c020de168beea66198852e7c7f5e2a2dac45
This commit is contained in:
jiahuay 2014-10-07 17:42:06 -07:00
parent a5eabe0343
commit 23c5d52cad
9 changed files with 2 additions and 37 deletions

View File

@ -7,7 +7,6 @@
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0" name="viewport">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="vendor/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" type="text/css" href="vendor/rickshaw/rickshaw.min.css" />
<link rel="stylesheet" type="text/css" href="vendor/nvd3/nv.d3.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular-ui-tree/angular-ui-tree.min.css">

View File

@ -5,7 +5,6 @@ define(['angular'], function() {
//'compass.charts',
//'ngAnimate',
//'ngTable',
//'angular-rickshaw'
]);
clusterModule.config(function($stateProvider, $urlRouterProvider) {

View File

@ -1,3 +1 @@
hostgroups
<rickshaw rickshaw-options="options" rickshaw-features="features" rickshaw-series="series">
</rickshaw>
hostgroups

View File

@ -1,11 +1,10 @@
define(['angularAnimate', 'angularRickshaw', 'angularUiTree', 'nvd3Directive'], function() {
define(['angularAnimate', 'angularUiTree', 'nvd3Directive'], function() {
var monitoringModule = angular.module('compass.monitoring', [
'ui.router',
'ui.bootstrap',
'compass.charts',
'ngAnimate',
'angular-rickshaw',
'nvd3ChartDirectives',
'ui.tree'
]);

View File

@ -1,16 +0,0 @@
$.fn.serializeObject = function()
{
var o = {};
var a = this.serializeArray();
$.each(a, function() {
if (o[this.name] !== undefined) {
if (!o[this.name].push) {
o[this.name] = [o[this.name]];
}
o[this.name].push(this.value || '');
} else {
o[this.name] = this.value || '';
}
});
return o;
};

View File

@ -16,8 +16,6 @@ require.config({
'd3': '../vendor/d3/d3.min',
'nvD3': '../vendor/nvd3/nv.d3.min',
'ganttChart':'common/gantt-chart-d3v2',
'rickshaw': '../vendor/rickshaw/rickshaw.min',
'angularRickshaw': '../vendor/angular-rickshaw/rickshaw.min',
'moment': '../vendor/angular-daterangepicker/moment.min',
'daterangepicker': '../vendor/angular-daterangepicker/daterangepicker',
'ngBsDaterangepicker': '../vendor/angular-daterangepicker/ng-bs-daterangepicker',
@ -99,17 +97,10 @@ require.config({
deps: ["nvD3"],
exports: "nvd3Directive"
},
"rickshaw": {
exports: "rickshaw"
},
"angularUiTree": {
deps: ["angular"],
exports: "angularUiTree"
},
"angularRickshaw": {
deps: ["angular", "rickshaw", "d3"],
exports: "angularRickshaw"
},
"moment": {
exports: "moment"
},

View File

@ -1 +0,0 @@
'use strict';angular.module('angular-rickshaw',[]).directive('rickshaw',function($compile){return{restrict:'EA',scope:{options:'=rickshawOptions',series:'=rickshawSeries',features:'=rickshawFeatures'},link:function(scope,element,attrs){function getSettings(el){var settings=angular.copy(scope.options);settings.element=el;settings.series=scope.series;return settings}var graph;function update(){var mainEl=angular.element(element);mainEl.append(graphEl);mainEl.empty();var graphEl=$compile('<div></div>')(scope);mainEl.append(graphEl);var settings=getSettings(graphEl[0]);graph=new Rickshaw.Graph(settings);if(scope.features&&scope.features.hover){var hoverConfig={graph:graph};hoverConfig.xFormatter=scope.features.hover.xFormatter;hoverConfig.yFormatter=scope.features.hover.yFormatter;hoverConfig.formatter=scope.features.hover.formatter;var hoverDetail=new Rickshaw.Graph.HoverDetail(hoverConfig)}if(scope.features&&scope.features.palette){var palette=new Rickshaw.Color.Palette({scheme:scope.features.palette});for(var i=0;i<settings.series.length;i++){settings.series[i].color=palette.color()}}graph.render();if(scope.features&&scope.features.xAxis){var xAxisConfig={graph:graph};if(scope.features.xAxis.timeUnit){var time=new Rickshaw.Fixtures.Time();xAxisConfig.timeUnit=time.unit(scope.features.xAxis.timeUnit)}var xAxis=new Rickshaw.Graph.Axis.Time(xAxisConfig);xAxis.render()}if(scope.features&&scope.features.yAxis){var yAxisConfig={graph:graph};if(scope.features.yAxis.tickFormat){yAxisConfig.tickFormat=Rickshaw.Fixtures.Number[scope.features.yAxis.tickFormat]}var yAxis=new Rickshaw.Graph.Axis.Y(yAxisConfig);yAxis.render()}if(scope.features&&scope.features.legend){var legendEl=$compile('<div></div>')(scope);mainEl.append(legendEl);var legend=new Rickshaw.Graph.Legend({graph:graph,element:legendEl[0]});if(scope.features.legend.toggle){var shelving=new Rickshaw.Graph.Behavior.Series.Toggle({graph:graph,legend:legend})}if(scope.features.legend.highlight){var highlighter=new Rickshaw.Graph.Behavior.Series.Highlight({graph:graph,legend:legend})}}}scope.$watch('options',function(newValue,oldValue){if(!angular.equals(newValue,oldValue)){update()}});scope.$watch('series',function(newValue,oldValue){if(!angular.equals(newValue,oldValue)){update()}});scope.$watch('features',function(newValue,oldValue){if(!angular.equals(newValue,oldValue)){update()}});update()},controller:function($scope,$element,$attrs){}}});

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long