dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11267 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-06-26 14:42:30 +0200
message:
  (DV) Constants lowercased.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-06-26 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-06-26 12:30:37 +0000
@@ -1984,9 +1984,9 @@
 			var buttons = [],
 				buttonAddedListener,
 				column,
-				stackedColumn,
+				stackedcolumn,
 				bar,
-				stackedBar,
+				stackedbar,
 				line,
 				area,
 				pie,
@@ -2062,9 +2062,9 @@
 				}
 			});
 
-			stackedColumn = Ext.create('Ext.button.Button', {
+			stackedcolumn = Ext.create('Ext.button.Button', {
 				xtype: 'button',
-				chartType: dv.conf.finals.chart.stackedColumn,
+				chartType: dv.conf.finals.chart.stackedcolumn,
 				icon: 'images/column-stacked.png',
 				name: dv.conf.finals.chart.stackedcolumn,
 				tooltipText: DV.i18n.stacked_column_chart,
@@ -2084,9 +2084,9 @@
 				}
 			});
 
-			stackedBar = Ext.create('Ext.button.Button', {
+			stackedbar = Ext.create('Ext.button.Button', {
 				xtype: 'button',
-				chartType: dv.conf.finals.chart.stackedBar,
+				chartType: dv.conf.finals.chart.stackedbar,
 				icon: 'images/bar-stacked.png',
 				name: dv.conf.finals.chart.stackedbar,
 				tooltipText: DV.i18n.stacked_bar_chart,
@@ -2168,9 +2168,9 @@
 						style: 'font-size:11px; font-weight:bold; padding:13px 8px 0 6px'
 					},
 					column,
-					stackedColumn,
+					stackedcolumn,
 					bar,
-					stackedBar,
+					stackedbar,
 					line,
 					area,
 					pie

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-06-26 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-06-26 12:30:37 +0000
@@ -103,9 +103,9 @@
             category: 'category',
             filter: 'filter',
             column: 'column',
-            stackedColumn: 'stackedColumn',
+            stackedcolumn: 'stackedcolumn',
             bar: 'bar',
-            stackedBar: 'stackedBar',
+            stackedbar: 'stackedbar',
             line: 'line',
             area: 'area',
             pie: 'pie'
@@ -1030,7 +1030,7 @@
 					axis;
 
 				// Set maximum if stacked + extra line
-				if ((xLayout.type === typeConf.stackedColumn || xLayout.type === typeConf.stackedBar) &&
+				if ((xLayout.type === typeConf.stackedcolumn || xLayout.type === typeConf.stackedbar) &&
 					(xLayout.showTrendLine || xLayout.targetLineValue || xLayout.baseLineValue)) {
 					var a = [store.getMaximum(), store.getMaximumSum()];
 					maximum = Math.ceil(Ext.Array.max(a) * 1.1);
@@ -1422,7 +1422,7 @@
 				return getDefaultChart(store, axes, series, xResponse, xLayout);
 			};
 
-			generator.stackedColumn = function(xResponse, xLayout) {
+			generator.stackedcolumn = function(xResponse, xLayout) {
 				var chart = this.column(xResponse, xLayout);
 
 				for (var i = 0, item; i < chart.series.items.length; i++) {
@@ -1503,7 +1503,7 @@
 				return getDefaultChart(store, axes, series, xResponse, xLayout);
 			};
 
-			generator.stackedBar = function(xResponse, xLayout) {
+			generator.stackedbar = function(xResponse, xLayout) {
 				var chart = this.bar(xResponse, xLayout);
 
 				for (var i = 0, item; i < chart.series.items.length; i++) {
@@ -1888,7 +1888,7 @@
 	api.layout.Layout = function(config) {
 		var layout = {};
 
-		// type: string ('column') - 'column', 'stackedColumn', 'bar', 'stackedBar', 'line', 'area', 'pie'
+		// type: string ('column') - 'column', 'stackedcolumn', 'bar', 'stackedbar', 'line', 'area', 'pie'
 
 		// columns: [Dimension]