move featuremanager.beforeShow/afterShow calls into common.show so th…

…at most modules don't know featuremanager anymore.
voidlabs · Jan 22, 2014 · 98dea7a · 98dea7a
1 parent a5dce71
commit 98dea7a
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 24 deletions.
diff --git a/src/elycharts_chart_barline.js b/src/elycharts_chart_barline.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************
@@ -76,9 +75,7 @@ $.elycharts.barline = {
         });
     }
 
-    featuresmanager.beforeShow(env, pieces);
     common.show(env, pieces);
-    featuresmanager.afterShow(env, pieces);
     return pieces;
   }
 };

diff --git a/src/elycharts_chart_funnel.js b/src/elycharts_chart_funnel.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************
@@ -39,9 +38,7 @@ $.elycharts.funnel = {
       var pieces = this.pieces(env, serie, 0, 1, 1, values);
     }
 
-    featuresmanager.beforeShow(env, pieces);
     common.show(env, pieces);
-    featuresmanager.afterShow(env, pieces);
     return pieces;
   },
 

diff --git a/src/elycharts_chart_line.js b/src/elycharts_chart_line.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************
@@ -285,9 +284,7 @@ $.elycharts.line = {
           pieces.push({ section : 'Series', serie : serie, subSection : 'Dot', path : false, attr : false });
       }
     }
-    featuresmanager.beforeShow(env, pieces);
     common.show(env, pieces);
-    featuresmanager.afterShow(env, pieces);
     return pieces;
   }, 
 

diff --git a/src/elycharts_chart_pie.js b/src/elycharts_chart_pie.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************
@@ -119,9 +118,7 @@ $.elycharts.pie = {
       pieces.push({ section : 'Series', serie : serie, subSection : 'Plot', paths : paths , mousearea : 'paths'});
     }
 
-    featuresmanager.beforeShow(env, pieces);
     common.show(env, pieces);
-    featuresmanager.afterShow(env, pieces);
     return pieces;
   }
 }

diff --git a/src/elycharts_core.js b/src/elycharts_core.js
@@ -791,8 +791,10 @@ $.elycharts.common = {
   },
 
 
-  show : function(env, pieces) {
-    pieces = this.getSortedPathData(pieces);
+  show : function(env, origPieces) {
+    if ($.elycharts.featuresmanager) $.elycharts.featuresmanager.beforeShow(env, origPieces);
+
+    pieces = this.getSortedPathData(origPieces);
 
     common.animationStackStart(env);
 
@@ -880,6 +882,8 @@ $.elycharts.common = {
     }
 
     common.animationStackEnd(env);
+
+    if ($.elycharts.featuresmanager) $.elycharts.featuresmanager.afterShow(env, origPieces);
   },
 
   /**

diff --git a/src/elycharts_manager_anchor.js b/src/elycharts_manager_anchor.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************

diff --git a/src/elycharts_manager_animation.js b/src/elycharts_manager_animation.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-//var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************

diff --git a/src/elycharts_manager_balloon.js b/src/elycharts_manager_balloon.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************

diff --git a/src/elycharts_manager_highlight.js b/src/elycharts_manager_highlight.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-//var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************

diff --git a/src/elycharts_manager_label.js b/src/elycharts_manager_label.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-//var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************

diff --git a/src/elycharts_manager_legend.js b/src/elycharts_manager_legend.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-//var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************

diff --git a/src/elycharts_manager_shadow.js b/src/elycharts_manager_shadow.js
@@ -8,9 +8,6 @@
 
 (function($) {
 
-//var featuresmanager = $.elycharts.featuresmanager;
-//var common = $.elycharts.common;
-
 /***********************************************************************
  * FEATURE: SHADOW
  **********************************************************************/

diff --git a/src/elycharts_manager_tooltip.js b/src/elycharts_manager_tooltip.js
@@ -8,7 +8,6 @@
 
 (function($) {
 
-//var featuresmanager = $.elycharts.featuresmanager;
 var common = $.elycharts.common;
 
 /***********************************************************************