This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit f5cfaaadedc72a2e254aab1ecc97516aebf6f29c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 15:27:50 2014 +0200 fixes #1066 remove convert jqplot chart and jqplot pie to image --- pollen-ui-angular/src/main/webapp/index.html | 1 - pollen-ui-angular/src/main/webapp/js/directives.js | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 68fdf3e..99c24d4 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -159,7 +159,6 @@ <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pieRenderer.min.js"></script> <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.categoryAxisRenderer.min.js"></script> <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pointLabels.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.highlighter.min.js"></script> <script language="javascript" type="text/javascript" src="lib/ckeditor/ckeditor.js"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 5916db9..78def59 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -328,7 +328,7 @@ angular.module('pollenDirective', []) $.jqplot.config.enablePlugins = true; scope.plot = $(element).find('div').jqplot([scope.data], { // Only animate if we're not using excanvas (not in IE 7 or IE 8).. - //animate: !$.jqplot.use_excanvas, + animate: !$.jqplot.use_excanvas, seriesDefaults:{ renderer:$.jqplot.BarRenderer, rendererOptions : { @@ -354,8 +354,8 @@ angular.module('pollenDirective', []) } }); - var imgData = $(element).find('div').jqplotToImageStr({}); - $(element).html('<img src="' + imgData + '" />') + //var imgData = $(element).find('div').jqplotToImageStr({}); + //$(element).html('<img src="' + imgData + '" />') } }; @@ -389,8 +389,6 @@ angular.module('pollenDirective', []) if (angular.isDefined(scope.data)) { $.jqplot.config.enablePlugins = true; $(element).find('div').jqplot([scope.data], { - // Only animate if we're not using excanvas (not in IE 7 or IE 8).. - animate: !$.jqplot.use_excanvas, seriesDefaults:{ renderer:$.jqplot.PieRenderer, rendererOptions : { @@ -406,8 +404,8 @@ angular.module('pollenDirective', []) } }); - var imgData = $(element).find('div').jqplotToImageStr({}); - $(element).html('<img src="' + imgData + '" />') + //var imgData = $(element).find('div').jqplotToImageStr({}); + //$(element).html('<img src="' + imgData + '" />') } }; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.