dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6986
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-05-18 14:29:18 +0200
message:
  Put skipAnimation conf option back in to plugin
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js	2012-05-17 22:04:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js	2012-05-18 12:29:18 +0000
@@ -200,7 +200,7 @@
 				getChart: function(project, axes, series, elWidth, elHeight) {
 					return Ext.create('Ext.chart.Chart', {
 						renderTo: project.state.conf.el,
-						animate: true,
+						animate: !project.state.conf.skipAnimation,
 						store: project.store,
 						insetPadding: DHIS.chart.conf.chart.style.inset,						
 						items: project.state.conf.hideSubtitle ? false : DHIS.chart.util.chart.def.getTitle(project),
@@ -683,6 +683,7 @@
                 el: '',
                 legendPosition: false,
                 orgUnitIsParent: false,
+                skipAnimation: false,
                 showData: false,
                 trendLine: false,
                 hideLegend: false,
@@ -1009,7 +1010,7 @@
 				renderTo: project.state.conf.el,
                 width: project.state.conf.width || this.el.getWidth(),
                 height: project.state.conf.height || this.el.getHeight(),
-                animate: true,
+                animate: !project.state.conf.skipAnimation,
                 shadow: true,
                 store: project.store,
                 insetPadding: 60,

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html	2012-05-17 22:04:22 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html	2012-05-18 12:29:18 +0000
@@ -60,6 +60,7 @@
 				filter: 'period',
 				organisationunits: ['ImspTQPwCqd'],
 				orgUnitIsParent: true,
+				skipAnimation: true,
 				showData: true,
 				trendLine: true,
 				hideLegend: false,

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js	2012-05-17 22:04:22 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js	2012-05-18 12:29:18 +0000
@@ -200,7 +200,7 @@
 				getChart: function(project, axes, series, elWidth, elHeight) {
 					return Ext.create('Ext.chart.Chart', {
 						renderTo: project.state.conf.el,
-						animate: true,
+						animate: !project.state.conf.skipAnimation,
 						store: project.store,
 						insetPadding: DHIS.chart.conf.chart.style.inset,						
 						items: project.state.conf.hideSubtitle ? false : DHIS.chart.util.chart.def.getTitle(project),
@@ -683,6 +683,7 @@
                 el: '',
                 legendPosition: false,
                 orgUnitIsParent: false,
+                skipAnimation: false,
                 showData: false,
                 trendLine: false,
                 hideLegend: false,
@@ -1009,7 +1010,7 @@
 				renderTo: project.state.conf.el,
                 width: project.state.conf.width || this.el.getWidth(),
                 height: project.state.conf.height || this.el.getHeight(),
-                animate: true,
+                animate: !project.state.conf.skipAnimation,
                 shadow: true,
                 store: project.store,
                 insetPadding: 60,