Chris Leonello avatar Chris Leonello committed 62e7c4e

Animation effects on initial plot draw working with point labels.

Comments (0)

Files changed (9)

examples/barLineAnimated.html

   <script language="javascript" type="text/javascript" src="../src/plugins/jqplot.barRenderer.js"></script>
   <script language="javascript" type="text/javascript" src="../src/plugins/jqplot.highlighter.js"></script>
   <script language="javascript" type="text/javascript" src="../src/plugins/jqplot.cursor.js"></script> 
-  <script type="text/javascript" src="./jquery-ui/js/jquery.effects.core.min.js"></script>
-  <script type="text/javascript" src="./jquery-ui/js/jquery.effects.blind.min.js"></script>
+  <script language="javascript" type="text/javascript" src="../src/plugins/jqplot.pointLabels.js"></script> 
   <!-- END: load jqplot -->
 
   <style type="text/css">
       [2007, 12800], [2008, 13200], [2009, 12600], [2010, 13100]];
 
       plot1 = $.jqplot("chart1", [s2, s1], {
+        animate: true,
         cursor: {
             show: true,
             zoom: true,
         },
         series:[
           {
+            pointLabels: {
+              show: true
+            },
             renderer: $.jqplot.BarRenderer,
             showHighlight: false,
             yaxis: 'y2axis',
               }
             },
             yaxis: {
+              tickOptions: {
+                formatString: "$%'d"
+              },
               rendererOptions: {
                 forceTickAt0: true
               }
             },
             y2axis: {
+              tickOptions: {
+                formatString: "$%'d"
+              },
               rendererOptions: {
                 // align the ticks on the y2 axis with the y axis.
                 alignTicks: true,
             show: true, 
             showLabel: true, 
             tooltipAxes: 'y',
-            sizeAdjust: 7.5 , tooltipLocation : 'ne' , formatString:"$%'i"}
+            sizeAdjust: 7.5 , tooltipLocation : 'ne'
+          }
       });
-
-      // Add animation to the bars and line.
-      // use jquery-ui to initially hide the canvases for the series.
-      // Then use the 'blind' effect to show the canvases.
-
-      plot1.series[0].canvas._elem.hide();
-      plot1.series[1].canvas._elem.hide();
-      plot1.series[0].canvas._elem.show('blind', {direction: 'down'}, 2000);
-      plot1.series[1].canvas._elem.show('blind', {direction: 'left'}, 2000);
+      
     });
 
 

examples/barTest.html

         var ticks = ['a', 'b', 'c', 'd'];
         
         plot1 = $.jqplot('chart1', [s1], {
+            animate: true,
             seriesDefaults:{
                 renderer:$.jqplot.BarRenderer,
                 pointLabels: { show: true }
         var ticks = ['a', 'b', 'c', 'd'];
         
         plot2 = $.jqplot('chart2', [s1, s2], {
+            animate: true,
             seriesDefaults: {
                 renderer:$.jqplot.BarRenderer,
                 pointLabels: { show: true }
     
   <script class="code" type="text/javascript">$(document).ready(function(){
         plot2b = $.jqplot('chart2b', [[[2,1], [4,2], [6,3], [3,4]], [[5,1], [1,2], [3,3], [4,4]], [[4,1], [7,2], [1,3], [2,4]]], {
+            animate: true,
             seriesDefaults: {
                 renderer:$.jqplot.BarRenderer,
                 pointLabels: { show: true, location: 'e', edgeTolerance: -15 },
         var s2 = [7, 5, 3, 2];
         var s3 = [14, 9, 3, 8];
         plot3 = $.jqplot('chart3', [s1, s2, s3], {
+            animate: true,
             stackSeries: true,
             captureRightClick: true,
             seriesDefaults:{
     
   <script class="code" type="text/javascript">$(document).ready(function(){
         plot4 = $.jqplot('chart4', [[[2,1], [6,2], [7,3], [10,4]], [[7,1], [5,2],[3,3],[2,4]], [[14,1], [9,2], [9,3], [8,4]]], {
+            animate: true,
             stackSeries: true,
             captureRightClick: true,
             seriesDefaults:{
     
   <script class="code" type="text/javascript">$(document).ready(function(){
         plot5 = $.jqplot('chart5', [[[2,1], [null,2], [7,3], [10,4]]], {
+            animate: true,
             captureRightClick: true,
             seriesDefaults:{
                 renderer:$.jqplot.BarRenderer,
 		var ticks = ['a', 'b', 'c', 'd'];
 
 		plot7 = $.jqplot('chart7', [s1], {
+            animate: true,
 			seriesDefaults:{
 				renderer:$.jqplot.BarRenderer,
 				rendererOptions: { fillToZero: true },

src/jqplot.core.js

         // >        {yaxis: 'y2axis', shadow: false, label:'bad line'}
         // >    ]
         // > }
-        
+
         // prop: show
         // wether or not to draw the series.
         this.show = true;
         }
         
         for (j=0; j<$.jqplot.postDrawSeriesHooks.length; j++) {
-            $.jqplot.postDrawSeriesHooks[j].call(this, sctx, options);
+            $.jqplot.postDrawSeriesHooks[j].call(this, sctx, options, plot);
         }
         
         sctx = opts = plot = j = data = gridData = null;
         // >     title: 'A Plot'
         // > }
         //
+
+        // prop: animate
+        // True to animate the series on initial plot draw (renderer dependent).
+        // Actual animation functionality must be supported in the renderer.
+        this.animate = false;
         // prop: axes
         // up to 4 axes are supported, each with it's own options, 
         // See <Axis> for axis specific options.
                 $.jqplot.preParseOptionsHooks[i].call(this, options);
             }
             this.options = $.extend(true, {}, this.defaults, options);
+            this.animate = this.options.animate;
             this.stackSeries = this.options.stackSeries;
             if (this.options.seriesColors) {
                 this.seriesColors = this.options.seriesColors;
                 for (var j=0; j<this.preParseSeriesOptionsHooks.hooks.length; j++) {
                     this.preParseSeriesOptionsHooks.hooks[j].call(temp, this.options.seriesDefaults, this.options.series[i]);
                 }
-                $.extend(true, temp, {seriesColors:this.seriesColors, negativeSeriesColors:this.negativeSeriesColors}, this.options.seriesDefaults, this.options.series[i]);
+                $.extend(true, temp, {seriesColors:this.seriesColors, negativeSeriesColors:this.negativeSeriesColors}, this.options.seriesDefaults, this.options.series[i], {rendererOptions:{animation:{show: this.animate}}});
                 var dir = 'vertical';
                 if (temp.renderer === $.jqplot.BarRenderer && temp.rendererOptions && temp.rendererOptions.barDirection == 'horizontal' && temp.transposeData === true) {
                     dir = 'horizontal';
         this.draw = function(){
             if (this.drawIfHidden || this.target.is(':visible')) {
                 this.target.trigger('jqplotPreDraw');
-                var i, j;
-                for (i=0; i<$.jqplot.preDrawHooks.length; i++) {
+                var i,
+                    j,
+                    l,
+                    tempseries;
+                for (i=0, l=$.jqplot.preDrawHooks.length; i<l; i++) {
                     $.jqplot.preDrawHooks[i].call(this);
                 }
-                for (i=0; i<this.preDrawHooks.hooks.length; i++) {
+                for (i=0, l=this.preDrawHooks.length; i<l; i++) {
                     this.preDrawHooks.hooks[i].apply(this, this.preDrawSeriesHooks.args[i]);
                 }
                 // create an underlying canvas to be used for special features.
                 this.grid.draw();
                 
                 // put the shadow canvases behind the series canvases so shadows don't overlap on stacked bars.
-                for (i=0; i<this.series.length; i++) {
+                for (i=0, l=this.series.length; i<l; i++) {
                     // draw series in order of stacking.  This affects only
                     // order in which canvases are added to dom.
                     j = this.seriesStack[i];
                     this.series[j].shadowCanvas._elem.data('seriesIndex', j);
                 }
                 
-                for (i=0; i<this.series.length; i++) {
+                for (i=0, l=this.series.length; i<l; i++) {
                     // draw series in order of stacking.  This affects only
                     // order in which canvases are added to dom.
                     j = this.seriesStack[i];
                 }
             
                 // register event listeners on the overlay canvas
-                for (var i=0; i<$.jqplot.eventListenerHooks.length; i++) {
+                for (var i=0, l=$.jqplot.eventListenerHooks.length; i<l; i++) {
                     // in the handler, this will refer to the eventCanvas dom element.
                     // make sure there are references back into plot objects.
                     this.eventCanvas._elem.bind($.jqplot.eventListenerHooks[i][0], {plot:this}, $.jqplot.eventListenerHooks[i][1]);
                 }
             
                 // register event listeners on the overlay canvas
-                for (var i=0; i<this.eventListenerHooks.hooks.length; i++) {
+                for (var i=0, l=this.eventListenerHooks.hooks.length; i<l; i++) {
                     // in the handler, this will refer to the eventCanvas dom element.
                     // make sure there are references back into plot objects.
                     this.eventCanvas._elem.bind(this.eventListenerHooks.hooks[i][0], {plot:this}, this.eventListenerHooks.hooks[i][1]);
                 }
 
-                for (var i=0; i<$.jqplot.postDrawHooks.length; i++) {
+                for (var i=0, l=$.jqplot.postDrawHooks.length; i<l; i++) {
                     $.jqplot.postDrawHooks[i].call(this);
                 }
 
-                for (var i=0; i<this.postDrawHooks.hooks.length; i++) {
+                for (var i=0, l=this.postDrawHooks.hooks.length; i<l; i++) {
                     this.postDrawHooks.hooks[i].apply(this, this.postDrawHooks.args[i]);
                 }
             
                 if (this.target.is(':visible')) {
                     this._drawCount += 1;
                 }
+
+                var temps, 
+                    tempr,
+                    sel = '.jqplot-point-label';
+                // ughh.  ideally would hide all series then show them.
+                for (i=0, l=this.series.length; i<l; i++) {
+                    temps = this.series[i];
+                    tempr = temps.renderer;
+                    if (tempr.animation && tempr.animation._supported && tempr.animation.show && this._drawCount < 2) {
+                        this.target.find(sel).hide();
+                        temps.canvas._elem.hide();
+                        temps.shadowCanvas._elem.hide();
+                        temps.canvas._elem.jqplotEffect('blind', {mode: 'show', direction: tempr.animation.direction}, tempr.animation.speed, 
+                            function(){ 
+                                $(this).parent().find(sel).fadeIn(500);
+                             } );
+                        temps.shadowCanvas._elem.jqplotEffect('blind', {mode: 'show', direction: tempr.animation.direction}, tempr.animation.speed);
+                    }
+                }
             
                 this.target.trigger('jqplotPostDraw', [this]);
             }

src/jqplot.effects.blind.js

  * Depends:
  *	jquery.effects.core.js
  */
+
+ //////
+ // jquery ui blind effect used for series animation in jqplot.
+ //////
 (function( $ ) {
 
 var rvertical = /up|down|vertical/,

src/jqplot.effects.core.js

  *
  * http://docs.jquery.com/UI/Effects/
  */
+
+ //////
+ // Much reduced version of jquery ui effects core used
+ // for series animation in jqplot.
+ //////
 (function($) {
 
-var backCompat = $.uiBackCompat !== false;
+	var backCompat = $.uiBackCompat !== false;
 
-$.jqplot.effects = {
-	effect: {}
-};
+	$.jqplot.effects = {
+		effect: {}
+	};
 
-/******************************************************************************/
-/****************************** COLOR ANIMATIONS ******************************/
-/******************************************************************************/
+	// prefix used for storing data on .data()
+	var dataSpace = "jqplot.storage.";
 
-// // override the animation for color styles
-// $.each(["backgroundColor", "borderBottomColor", "borderLeftColor",
-// 	"borderRightColor", "borderTopColor", "borderColor", "color", "outlineColor"],
-// function(i, attr) {
-// 	$.fx.step[attr] = function(fx) {
-// 		if (!fx.colorInit) {
-// 			fx.start = getColor(fx.elem, attr);
-// 			fx.end = getRGB(fx.end);
-// 			fx.colorInit = true;
-// 		}
+	/******************************************************************************/
+	/*********************************** EFFECTS **********************************/
+	/******************************************************************************/
 
-// 		fx.elem.style[attr] = "rgb(" +
-// 			Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0) + "," +
-// 			Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0) + "," +
-// 			Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0) + ")";
-// 	};
-// });
+	$.extend( $.jqplot.effects, {
+		version: "1.9pre",
 
-// // Color Conversion functions from highlightFade
-// // By Blair Mitchelmore
-// // http://jquery.offput.ca/highlightFade/
+		// Saves a set of properties in a data storage
+		save: function( element, set ) {
+			for( var i=0; i < set.length; i++ ) {
+				if ( set[ i ] !== null ) {
+					element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
+				}
+			}
+		},
 
-// // Parse strings looking for color tuples [255,255,255]
-// function getRGB(color) {
-// 		var result;
+		// Restores a set of previously saved properties from a data storage
+		restore: function( element, set ) {
+			for( var i=0; i < set.length; i++ ) {
+				if ( set[ i ] !== null ) {
+					element.css( set[ i ], element.data( dataSpace + set[ i ] ) );
+				}
+			}
+		},
 
-// 		// Check if we're already dealing with an array of colors
-// 		if ( color && color.constructor === Array && color.length === 3 )
-// 				return color;
+		setMode: function( el, mode ) {
+			if (mode === "toggle") {
+				mode = el.is( ":hidden" ) ? "show" : "hide";
+			}
+			return mode;
+		},
 
-// 		// Look for rgb(num,num,num)
-// 		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
-// 				return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
+		// Wraps the element around a wrapper that copies position properties
+		createWrapper: function( element ) {
 
-// 		// Look for rgb(num%,num%,num%)
-// 		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
-// 				return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
+			// if the element is already wrapped, return it
+			if ( element.parent().is( ".ui-effects-wrapper" )) {
+				return element.parent();
+			}
 
-// 		// Look for #a0b1c2
-// 		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
-// 				return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
+			// wrap the element
+			var props = {
+					width: element.outerWidth(true),
+					height: element.outerHeight(true),
+					"float": element.css( "float" )
+				},
+				wrapper = $( "<div></div>" )
+					.addClass( "ui-effects-wrapper" )
+					.css({
+						fontSize: "100%",
+						background: "transparent",
+						border: "none",
+						margin: 0,
+						padding: 0
+					}),
+				// Store the size in case width/height are defined in % - Fixes #5245
+				size = {
+					width: element.width(),
+					height: element.height()
+				},
+				active = document.activeElement;
 
-// 		// Look for #fff
-// 		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
-// 				return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
-
-// 		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-// 		if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
-// 				return colors["transparent"];
-
-// 		// Otherwise, we're most likely dealing with a named color
-// 		return colors[$.trim(color).toLowerCase()];
-// }
-
-// function getColor(elem, attr) {
-// 		var color;
-
-// 		do {
-// 				color = $.curCSS(elem, attr);
-
-// 				// Keep going until we find an element that has color, or we hit the body
-// 				if ( color != "" && color !== "transparent" || $.nodeName(elem, "body") )
-// 						break;
-
-// 				attr = "backgroundColor";
-// 		} while ( elem = elem.parentNode );
-
-// 		return getRGB(color);
-// };
-
-// // Some named colors to work with
-// // From Interface by Stefan Petre
-// // http://interface.eyecon.ro/
-
-// var colors = {
-// 	aqua:[0,255,255],
-// 	azure:[240,255,255],
-// 	beige:[245,245,220],
-// 	black:[0,0,0],
-// 	blue:[0,0,255],
-// 	brown:[165,42,42],
-// 	cyan:[0,255,255],
-// 	darkblue:[0,0,139],
-// 	darkcyan:[0,139,139],
-// 	darkgrey:[169,169,169],
-// 	darkgreen:[0,100,0],
-// 	darkkhaki:[189,183,107],
-// 	darkmagenta:[139,0,139],
-// 	darkolivegreen:[85,107,47],
-// 	darkorange:[255,140,0],
-// 	darkorchid:[153,50,204],
-// 	darkred:[139,0,0],
-// 	darksalmon:[233,150,122],
-// 	darkviolet:[148,0,211],
-// 	fuchsia:[255,0,255],
-// 	gold:[255,215,0],
-// 	green:[0,128,0],
-// 	indigo:[75,0,130],
-// 	khaki:[240,230,140],
-// 	lightblue:[173,216,230],
-// 	lightcyan:[224,255,255],
-// 	lightgreen:[144,238,144],
-// 	lightgrey:[211,211,211],
-// 	lightpink:[255,182,193],
-// 	lightyellow:[255,255,224],
-// 	lime:[0,255,0],
-// 	magenta:[255,0,255],
-// 	maroon:[128,0,0],
-// 	navy:[0,0,128],
-// 	olive:[128,128,0],
-// 	orange:[255,165,0],
-// 	pink:[255,192,203],
-// 	purple:[128,0,128],
-// 	violet:[128,0,128],
-// 	red:[255,0,0],
-// 	silver:[192,192,192],
-// 	white:[255,255,255],
-// 	yellow:[255,255,0],
-// 	transparent: [255,255,255]
-// };
-
-
-
-/******************************************************************************/
-/****************************** CLASS ANIMATIONS ******************************/
-/******************************************************************************/
-
-// var classAnimationActions = [ "add", "remove", "toggle" ],
-// 	shorthandStyles = {
-// 		border: 1,
-// 		borderBottom: 1,
-// 		borderColor: 1,
-// 		borderLeft: 1,
-// 		borderRight: 1,
-// 		borderTop: 1,
-// 		borderWidth: 1,
-// 		margin: 1,
-// 		padding: 1
-// 	},
-	// prefix used for storing data on .data()
-	dataSpace = "ec.storage.";
-
-// $.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
-// 	$.fx.step[ prop ] = function( fx ) {
-// 		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-// 			jQuery.style( fx.elem, prop, fx.end );
-// 			fx.setAttr = true;
-// 		}
-// 	};
-// });
-
-// function getElementStyles() {
-// 	var style = this.ownerDocument.defaultView
-// 			? this.ownerDocument.defaultView.getComputedStyle( this, null )
-// 			: this.currentStyle,
-// 		newStyle = {},
-// 		key,
-// 		camelCase,
-// 		len;
-
-// 	// webkit enumerates style porperties
-// 	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-// 		len = style.length;
-// 		while ( len-- ) {
-// 			key = style[ len ];
-// 			if ( typeof style[ key ] === "string" ) {
-// 				newStyle[ $.camelCase( key ) ] = style[ key ];
-// 			}
-// 		}
-// 	} else {
-// 		for ( key in style ) {
-// 			if ( typeof style[ key ] === "string" ) {
-// 				newStyle[ key ] = style[ key ];
-// 			}
-// 		}
-// 	}
-
-// 	return newStyle;
-// }
-
-
-// function styleDifference( oldStyle, newStyle ) {
-// 	var diff = {},
-// 		name, value;
-
-// 	for ( name in newStyle ) {
-// 		value = newStyle[ name ];
-// 		if ( oldStyle[ name ] != value ) {
-// 			if ( !shorthandStyles[ name ] ) {
-// 				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
-// 					diff[ name ] = value;
-// 				}
-// 			}
-// 		}
-// 	}
-
-// 	return diff;
-// }
-
-// $.jqplot.effects.animateClass = function( value, duration, easing, callback ) {
-// 	var o = $.speed( duration, easing, callback );
-
-// 	return this.queue( function() {
-// 		var animated = $( this ),
-// 			baseClass = animated.attr( "class" ) || "",
-// 			finalClass,
-// 			allAnimations = o.children ? animated.find( "*" ).andSelf() : animated;
-
-// 		// map the animated objects to store the original styles.
-// 		allAnimations = allAnimations.map(function() {
-// 			var el = $( this );
-// 			return {
-// 				el: el,
-// 				originalStyleAttr: el.attr( "style" ) || " ",
-// 				start: getElementStyles.call( this )
-// 			};
-// 		});
-
-// 		// apply class change
-// 		$.each( classAnimationActions, function(i, action) {
-// 			if ( value[ action ] ) {
-// 				animated[ action + "Class" ]( value[ action ] );
-// 			}
-// 		});
-// 		finalClass = animated.attr( "class" );
-
-// 		// map all animated objects again - calculate new styles and diff
-// 		allAnimations = allAnimations.map(function() {
-// 			this.end = getElementStyles.call( this.el[ 0 ] );
-// 			this.diff = styleDifference( this.start, this.end );
-// 			return this;
-// 		});
-
-// 		// apply original class
-// 		animated.attr( "class", baseClass );
-
-// 		// map all animated objects again - this time collecting a promise
-// 		allAnimations = allAnimations.map(function() {
-// 			var styleInfo = this,
-// 				dfd = $.Deferred();
-
-// 			this.el.animate( this.diff, {
-// 				duration: o.duration,
-// 				easing: o.easing,
-// 				queue: false,
-// 				complete: function() {
-// 					dfd.resolve( styleInfo );
-// 				}
-// 			});
-// 			return dfd.promise();
-// 		});
-
-// 		// once all animations have completed:
-// 		$.when.apply( $, allAnimations.get() ).done(function() {
-
-// 			// set the final class
-// 			animated.attr( "class", finalClass );
-
-// 			// for each animated element
-// 			$.each( arguments, function() {
-// 				if ( typeof this.el.attr( "style" ) === "object" ) {
-// 					this.el.attr( "style" ).cssText = "";
-// 					this.el.attr( "style" ).cssText = this.originalStyleAttr;
-// 				} else {
-// 					this.el.attr( "style", this.originalStyleAttr );
-// 				}
-// 			});
-
-// 			// this is guarnteed to be there if you use jQuery.speed()
-// 			// it also handles dequeuing the next anim...
-// 			o.complete.call( animated[ 0 ] );
-// 		});
-// 	});
-// };
-
-// $.fn.extend({
-// 	_addClass: $.fn.addClass,
-// 	addClass: function( classNames, speed, easing, callback ) {
-// 		return speed ?
-// 			$.jqplot.effects.animateClass.apply( this, [{ add: classNames }, speed, easing, callback ]) :
-// 			this._addClass(classNames);
-// 	},
-
-// 	_removeClass: $.fn.removeClass,
-// 	removeClass: function( classNames, speed, easing, callback ) {
-// 		return speed ?
-// 			$.jqplot.effects.animateClass.apply( this, [{ remove: classNames }, speed, easing, callback ]) :
-// 			this._removeClass(classNames);
-// 	},
-
-// 	_toggleClass: $.fn.toggleClass,
-// 	toggleClass: function( classNames, force, speed, easing, callback ) {
-// 		if ( typeof force === "boolean" || force === undefined ) {
-// 			if ( !speed ) {
-// 				// without speed parameter;
-// 				return this._toggleClass( classNames, force );
-// 			} else {
-// 				return $.jqplot.effects.animateClass.apply( this, [( force ? { add:classNames } : { remove:classNames }), speed, easing, callback ]);
-// 			}
-// 		} else {
-// 			// without force parameter;
-// 			return $.jqplot.effects.animateClass.apply( this, [{ toggle: classNames }, force, speed, easing ]);
-// 		}
-// 	},
-
-// 	switchClass: function( remove, add, speed, easing, callback) {
-// 		return $.jqplot.effects.animateClass.apply( this, [{
-// 				add: add,
-// 				remove: remove
-// 			}, speed, easing, callback ]);
-// 	}
-// });
-
-
-
-/******************************************************************************/
-/*********************************** EFFECTS **********************************/
-/******************************************************************************/
-
-$.extend( $.jqplot.effects, {
-	version: "1.9pre",
-
-	// Saves a set of properties in a data storage
-	save: function( element, set ) {
-		for( var i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-			}
-		}
-	},
-
-	// Restores a set of previously saved properties from a data storage
-	restore: function( element, set ) {
-		for( var i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.css( set[ i ], element.data( dataSpace + set[ i ] ) );
-			}
-		}
-	},
-
-	setMode: function( el, mode ) {
-		if (mode === "toggle") {
-			mode = el.is( ":hidden" ) ? "show" : "hide";
-		}
-		return mode;
-	},
-
-	// // Translates a [top,left] array into a baseline value
-	// // this should be a little more flexible in the future to handle a string & hash
-	// getBaseline: function( origin, original ) {
-	// 	var y, x;
-	// 	switch ( origin[ 0 ] ) {
-	// 		case "top": y = 0; break;
-	// 		case "middle": y = 0.5; break;
-	// 		case "bottom": y = 1; break;
-	// 		default: y = origin[ 0 ] / original.height;
-	// 	};
-	// 	switch ( origin[ 1 ] ) {
-	// 		case "left": x = 0; break;
-	// 		case "center": x = 0.5; break;
-	// 		case "right": x = 1; break;
-	// 		default: x = origin[ 1 ] / original.width;
-	// 	};
-	// 	return {
-	// 		x: x,
-	// 		y: y
-	// 	};
-	// },
-
-	// Wraps the element around a wrapper that copies position properties
-	createWrapper: function( element ) {
-
-		// if the element is already wrapped, return it
-		if ( element.parent().is( ".ui-effects-wrapper" )) {
-			return element.parent();
-		}
-
-		// wrap the element
-		var props = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
-				"float": element.css( "float" )
-			},
-			wrapper = $( "<div></div>" )
-				.addClass( "ui-effects-wrapper" )
-				.css({
-					fontSize: "100%",
-					background: "transparent",
-					border: "none",
-					margin: 0,
-					padding: 0
-				}),
-			// Store the size in case width/height are defined in % - Fixes #5245
-			size = {
-				width: element.width(),
-				height: element.height()
-			},
-			active = document.activeElement;
-
-		element.wrap( wrapper );
-
-		// Fixes #7595 - Elements lose focus when wrapped.
-		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-			$( active ).focus();
-		}
-
-		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
-
-		// transfer positioning properties to the wrapper
-		if ( element.css( "position" ) === "static" ) {
-			wrapper.css({ position: "relative" });
-			element.css({ position: "relative" });
-		} else {
-			$.extend( props, {
-				position: element.css( "position" ),
-				zIndex: element.css( "z-index" )
-			});
-			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
-				props[ pos ] = element.css( pos );
-				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-					props[ pos ] = "auto";
-				}
-			});
-			element.css({
-				position: "relative",
-				top: 0,
-				left: 0,
-				right: "auto",
-				bottom: "auto"
-			});
-		}
-		element.css(size);
-
-		return wrapper.css( props ).show();
-	},
-
-	removeWrapper: function( element ) {
-		var active = document.activeElement;
-
-		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-			element.parent().replaceWith( element );
+			element.wrap( wrapper );
 
 			// Fixes #7595 - Elements lose focus when wrapped.
 			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
 				$( active ).focus();
 			}
+
+			wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
+
+			// transfer positioning properties to the wrapper
+			if ( element.css( "position" ) === "static" ) {
+				wrapper.css({ position: "relative" });
+				element.css({ position: "relative" });
+			} else {
+				$.extend( props, {
+					position: element.css( "position" ),
+					zIndex: element.css( "z-index" )
+				});
+				$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
+					props[ pos ] = element.css( pos );
+					if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
+						props[ pos ] = "auto";
+					}
+				});
+				element.css({
+					position: "relative",
+					top: 0,
+					left: 0,
+					right: "auto",
+					bottom: "auto"
+				});
+			}
+			element.css(size);
+
+			return wrapper.css( props ).show();
+		},
+
+		removeWrapper: function( element ) {
+			var active = document.activeElement;
+
+			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+				element.parent().replaceWith( element );
+
+				// Fixes #7595 - Elements lose focus when wrapped.
+				if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+					$( active ).focus();
+				}
+			}
+
+
+			return element;
+		}
+	});
+
+	// return an effect options object for the given parameters:
+	function _normalizeArguments( effect, options, speed, callback ) {
+
+		// short path for passing an effect options object:
+		if ( $.isPlainObject( effect ) ) {
+			return effect;
 		}
 
+		// convert to an object
+		effect = { effect: effect };
 
-		return element;
-	},
+		// catch (effect)
+		if ( options === undefined ) {
+			options = {};
+		}
 
-	// setTransition: function( element, list, factor, value ) {
-	// 	value = value || {};
-	// 	$.each( list, function(i, x){
-	// 		var unit = element.cssUnit( x );
-	// 		if ( unit[ 0 ] > 0 ) value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
-	// 	});
-	// 	return value;
-	// }
-});
+		// catch (effect, callback)
+		if ( $.isFunction( options ) ) {
+			callback = options;
+			speed = null;
+			options = {};
+		}
 
-// return an effect options object for the given parameters:
-function _normalizeArguments( effect, options, speed, callback ) {
+		// catch (effect, speed, ?)
+		if ( $.type( options ) === "number" || $.fx.speeds[ options ]) {
+			callback = speed;
+			speed = options;
+			options = {};
+		}
 
-	// short path for passing an effect options object:
-	if ( $.isPlainObject( effect ) ) {
+		// catch (effect, options, callback)
+		if ( $.isFunction( speed ) ) {
+			callback = speed;
+			speed = null;
+		}
+
+		// add options to effect
+		if ( options ) {
+			$.extend( effect, options );
+		}
+
+		speed = speed || options.duration;
+		effect.duration = $.fx.off ? 0 : typeof speed === "number"
+			? speed : speed in $.fx.speeds ? $.fx.speeds[ speed ] : $.fx.speeds._default;
+
+		effect.complete = callback || options.complete;
+
 		return effect;
 	}
 
-	// convert to an object
-	effect = { effect: effect };
+	function standardSpeed( speed ) {
+		// valid standard speeds
+		if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
+			return true;
+		}
 
-	// catch (effect)
-	if ( options === undefined ) {
-		options = {};
+		// invalid strings - treat as "normal" speed
+		if ( typeof speed === "string" && !$.jqplot.effects.effect[ speed ] ) {
+			// TODO: remove in 2.0 (#7115)
+			if ( backCompat && $.jqplot.effects[ speed ] ) {
+				return false;
+			}
+			return true;
+		}
+
+		return false;
 	}
 
-	// catch (effect, callback)
-	if ( $.isFunction( options ) ) {
-		callback = options;
-		speed = null;
-		options = {};
-	}
+	$.fn.extend({
+		jqplotEffect: function( effect, options, speed, callback ) {
+			var args = _normalizeArguments.apply( this, arguments ),
+				mode = args.mode,
+				queue = args.queue,
+				effectMethod = $.jqplot.effects.effect[ args.effect ],
 
-	// catch (effect, speed, ?)
-	if ( $.type( options ) === "number" || $.fx.speeds[ options ]) {
-		callback = speed;
-		speed = options;
-		options = {};
-	}
+				// DEPRECATED: remove in 2.0 (#7115)
+				oldEffectMethod = !effectMethod && backCompat && $.jqplot.effects[ args.effect ];
 
-	// catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
-		callback = speed;
-		speed = null;
-	}
+			if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
+				// delegate to the original method (e.g., .show()) if possible
+				if ( mode ) {
+					return this[ mode ]( args.duration, args.complete );
+				} else {
+					return this.each( function() {
+						if ( args.complete ) {
+							args.complete.call( this );
+						}
+					});
+				}
+			}
 
-	// add options to effect
-	if ( options ) {
-		$.extend( effect, options );
-	}
+			function run( next ) {
+				var elem = $( this ),
+					complete = args.complete,
+					mode = args.mode;
 
-	speed = speed || options.duration;
-	effect.duration = $.fx.off ? 0 : typeof speed === "number"
-		? speed : speed in $.fx.speeds ? $.fx.speeds[ speed ] : $.fx.speeds._default;
+				function done() {
+					if ( $.isFunction( complete ) ) {
+						complete.call( elem[0] );
+					}
+					if ( $.isFunction( next ) ) {
+						next();
+					}
+				}
 
-	effect.complete = callback || options.complete;
+				// if the element is hiddden and mode is hide,
+				// or element is visible and mode is show
+				if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+					done();
+				} else {
+					effectMethod.call( elem[0], args, done );
+				}
+			}
 
-	return effect;
-}
-
-function standardSpeed( speed ) {
-	// valid standard speeds
-	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
-		return true;
-	}
-
-	// invalid strings - treat as "normal" speed
-	if ( typeof speed === "string" && !$.jqplot.effects.effect[ speed ] ) {
-		// TODO: remove in 2.0 (#7115)
-		if ( backCompat && $.jqplot.effects[ speed ] ) {
-			return false;
-		}
-		return true;
-	}
-
-	return false;
-}
-
-$.fn.extend({
-	jqplotEffect: function( effect, options, speed, callback ) {
-		var args = _normalizeArguments.apply( this, arguments ),
-			mode = args.mode,
-			queue = args.queue,
-			effectMethod = $.jqplot.effects.effect[ args.effect ],
-
-			// DEPRECATED: remove in 2.0 (#7115)
-			oldEffectMethod = !effectMethod && backCompat && $.jqplot.effects[ args.effect ];
-
-		if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
-			// delegate to the original method (e.g., .show()) if possible
-			if ( mode ) {
-				return this[ mode ]( args.duration, args.complete );
+			// TODO: remove this check in 2.0, effectMethod will always be true
+			if ( effectMethod ) {
+				return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
 			} else {
-				return this.each( function() {
-					if ( args.complete ) {
-						args.complete.call( this );
-					}
+				// DEPRECATED: remove in 2.0 (#7115)
+				return oldEffectMethod.call(this, {
+					options: args,
+					duration: args.duration,
+					callback: args.complete,
+					mode: args.mode
 				});
 			}
 		}
-
-		function run( next ) {
-			var elem = $( this ),
-				complete = args.complete,
-				mode = args.mode;
-
-			function done() {
-				if ( $.isFunction( complete ) ) {
-					complete.call( elem[0] );
-				}
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			}
-
-			// if the element is hiddden and mode is hide,
-			// or element is visible and mode is show
-			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-				done();
-			} else {
-				effectMethod.call( elem[0], args, done );
-			}
-		}
-
-		// TODO: remove this check in 2.0, effectMethod will always be true
-		if ( effectMethod ) {
-			return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
-		} else {
-			// DEPRECATED: remove in 2.0 (#7115)
-			return oldEffectMethod.call(this, {
-				options: args,
-				duration: args.duration,
-				callback: args.complete,
-				mode: args.mode
-			});
-		}
-	},
-
-	// _show: $.fn.show,
-	// show: function( speed ) {
-	// 	if ( standardSpeed( speed ) ) {
-	// 		return this._show.apply( this, arguments );
-	// 	} else {
-	// 		var args = _normalizeArguments.apply( this, arguments );
-	// 		args.mode = "show";
-	// 		return this.effect.call( this, args );
-	// 	}
-	// },
-
-	// _hide: $.fn.hide,
-	// hide: function( speed ) {
-	// 	if ( standardSpeed( speed ) ) {
-	// 		return this._hide.apply( this, arguments );
-	// 	} else {
-	// 		var args = _normalizeArguments.apply( this, arguments );
-	// 		args.mode = "hide";
-	// 		return this.effect.call( this, args );
-	// 	}
-	// },
-
-	// // jQuery core overloads toggle and creates _toggle
-	// __toggle: $.fn.toggle,
-	// toggle: function( speed ) {
-	// 	if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
-	// 		return this.__toggle.apply( this, arguments );
-	// 	} else {
-	// 		var args = _normalizeArguments.apply( this, arguments );
-	// 		args.mode = "toggle";
-	// 		return this.effect.call( this, args );
-	// 	}
-	// },
-
-	// // helper functions
-	// cssUnit: function(key) {
-	// 	var style = this.css( key ),
-	// 		val = [];
-
-	// 	$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
-	// 		if ( style.indexOf( unit ) > 0 )
-	// 			val = [ parseFloat( style ), unit ];
-	// 	});
-	// 	return val;
-	// }
-});
-
-
-
-/******************************************************************************/
-/*********************************** EASING ***********************************/
-/******************************************************************************/
-
-/*
- * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
- *
- * Uses the built in easing capabilities added In jQuery 1.1
- * to offer multiple easing options
- *
- * TERMS OF USE - jQuery Easing
- *
- * Open source under the BSD License.
- *
- * Copyright 2008 George McGinley Smith
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list
- * of conditions and the following disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * Neither the name of the author nor the names of contributors may be used to endorse
- * or promote products derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
-*/
-
-// t: current time, b: begInnIng value, c: change In value, d: duration
-// $.easing.jswing = $.easing.swing;
-
-// $.extend( $.easing, {
-// 	def: "easeOutQuad",
-// 	swing: function ( x, t, b, c, d ) {
-// 		return $.easing[ $.easing.def ]( x, t, b, c, d );
-// 	},
-// 	easeInQuad: function ( x, t, b, c, d ) {
-// 		return c * ( t /= d ) * t + b;
-// 	},
-// 	easeOutQuad: function ( x, t, b, c, d ) {
-// 		return -c * ( t /= d ) * ( t - 2 ) + b;
-// 	},
-// 	easeInOutQuad: function ( x, t, b, c, d ) {
-// 		if ( ( t /= d / 2 ) < 1 ) return c / 2 * t * t + b;
-// 		return -c / 2 * ( ( --t ) * ( t-2 ) - 1) + b;
-// 	},
-// 	easeInCubic: function ( x, t, b, c, d ) {
-// 		return c * ( t /= d ) * t * t + b;
-// 	},
-// 	easeOutCubic: function ( x, t, b, c, d ) {
-// 		return c * ( ( t = t / d - 1 ) * t * t + 1 ) + b;
-// 	},
-// 	easeInOutCubic: function ( x, t, b, c, d ) {
-// 		if ( ( t /= d / 2 ) < 1 ) return c / 2 * t * t * t + b;
-// 		return c / 2 * ( ( t -= 2 ) * t * t + 2) + b;
-// 	},
-// 	easeInQuart: function ( x, t, b, c, d ) {
-// 		return c * ( t /= d ) * t * t * t + b;
-// 	},
-// 	easeOutQuart: function ( x, t, b, c, d ) {
-// 		return -c * ( ( t = t / d - 1 ) * t * t * t - 1) + b;
-// 	},
-// 	easeInOutQuart: function ( x, t, b, c, d ) {
-// 		if ( (t /= d / 2 ) < 1 ) return c / 2 * t * t * t * t + b;
-// 		return -c / 2 * ( ( t -= 2 ) * t * t * t - 2) + b;
-// 	},
-// 	easeInQuint: function ( x, t, b, c, d ) {
-// 		return c * ( t /= d ) * t * t * t * t + b;
-// 	},
-// 	easeOutQuint: function ( x, t, b, c, d ) {
-// 		return c * ( ( t = t / d - 1 ) * t * t * t * t + 1) + b;
-// 	},
-// 	easeInOutQuint: function ( x, t, b, c, d ) {
-// 		if ( ( t /= d / 2 ) < 1 ) return c / 2 * t * t  * t * t * t + b;
-// 		return c / 2 * ( ( t -= 2 ) * t * t * t * t + 2) + b;
-// 	},
-// 	easeInSine: function ( x, t, b, c, d ) {
-// 		return -c * Math.cos( t / d * ( Math.PI / 2 ) ) + c + b;
-// 	},
-// 	easeOutSine: function ( x, t, b, c, d ) {
-// 		return c * Math.sin( t / d * ( Math.PI /2 ) ) + b;
-// 	},
-// 	easeInOutSine: function ( x, t, b, c, d ) {
-// 		return -c / 2 * ( Math.cos( Math.PI * t / d ) - 1 ) + b;
-// 	},
-// 	easeInExpo: function ( x, t, b, c, d ) {
-// 		return ( t==0 ) ? b : c * Math.pow( 2, 10 * ( t / d - 1) ) + b;
-// 	},
-// 	easeOutExpo: function ( x, t, b, c, d ) {
-// 		return ( t==d ) ? b + c : c * ( -Math.pow( 2, -10 * t / d) + 1) + b;
-// 	},
-// 	easeInOutExpo: function ( x, t, b, c, d ) {
-// 		if ( t==0 ) return b;
-// 		if ( t==d ) return b + c;
-// 		if ( ( t /= d / 2) < 1) return c / 2 * Math.pow( 2, 10 * (t - 1) ) + b;
-// 		return c / 2 * ( -Math.pow( 2, -10 * --t ) + 2 ) + b;
-// 	},
-// 	easeInCirc: function ( x, t, b, c, d ) {
-// 		return -c * ( Math.sqrt( 1 - ( t /= d ) * t ) - 1 ) + b;
-// 	},
-// 	easeOutCirc: function ( x, t, b, c, d ) {
-// 		return c * Math.sqrt( 1 - ( t = t / d - 1 ) * t ) + b;
-// 	},
-// 	easeInOutCirc: function ( x, t, b, c, d ) {
-// 		if ( ( t /= d / 2) < 1 ) return -c / 2 * ( Math.sqrt( 1 - t * t ) - 1 ) + b;
-// 		return c / 2 * ( Math.sqrt( 1 - ( t -= 2 ) * t ) + 1 ) + b;
-// 	},
-// 	easeInElastic: function ( x, t, b, c, d ) {
-// 		var s = 1.70158,
-// 			p = d * 0.3,
-// 			a = c;
-// 		if ( t == 0 ) return b;
-// 		if ( ( t /= d ) == 1 ) return b+c;
-// 		if ( a < Math.abs( c ) ) {
-// 			a = c;
-// 			s = p / 4;
-// 		} else {
-// 			s = p / ( 2 * Math.PI ) * Math.asin( c / a );
-// 		}
-// 		return - ( a * Math.pow( 2, 10 * ( t -= 1 ) ) * Math.sin( ( t * d - s) * ( 2 * Math.PI ) / p ) ) + b;
-// 	},
-// 	easeOutElastic: function ( x, t, b, c, d ) {
-// 		var s = 1.70158,
-// 			p = d * 0.3,
-// 			a = c;
-// 		if ( t == 0 ) return b;
-// 		if ( ( t /= d ) == 1 ) return b+c;
-// 		if ( a < Math.abs( c ) ) {
-// 			a = c;
-// 			s = p / 4;
-// 		} else {
-// 			s = p / ( 2 * Math.PI ) * Math.asin( c / a );
-// 		}
-// 		return a * Math.pow( 2, -10 * t ) * Math.sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) + c + b;
-// 	},
-// 	easeInOutElastic: function ( x, t, b, c, d ) {
-// 		var s = 1.70158,
-// 			p = d * ( 0.3 * 1.5 ),
-// 			a = c;
-// 		if ( t == 0 ) return b;
-// 		if ( ( t /= d / 2 ) == 2 ) return b+c;
-// 		if ( a < Math.abs( c ) ) {
-// 			a = c;
-// 			s = p / 4;
-// 		} else {
-// 			s = p / ( 2 * Math.PI ) * Math.asin( c / a );
-// 		}
-// 		if ( t < 1 ) return -.5 * ( a * Math.pow( 2, 10 * ( t -= 1 ) ) * Math.sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) ) + b;
-// 		return a * Math.pow( 2, -10 * ( t -= 1 ) ) * Math.sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) *.5 + c + b;
-// 	},
-// 	easeInBack: function ( x, t, b, c, d, s ) {
-// 		if ( s == undefined ) s = 1.70158;
-// 		return c * ( t /= d ) * t * ( ( s+1 ) * t - s ) + b;
-// 	},
-// 	easeOutBack: function ( x, t, b, c, d, s ) {
-// 		if ( s == undefined ) s = 1.70158;
-// 		return c * ( ( t = t / d - 1 ) * t * ( ( s + 1 ) * t + s) + 1) + b;
-// 	},
-// 	easeInOutBack: function ( x, t, b, c, d, s ) {
-// 		if ( s == undefined ) s = 1.70158;
-// 		if ( ( t /= d / 2 ) < 1 ) return c / 2 * ( t * t * ( ( ( s *= 1.525 ) + 1 ) * t - s ) ) + b;
-// 		return c / 2 * ( ( t -= 2 ) * t * ( ( ( s *= 1.525 ) + 1 ) * t + s) + 2) + b;
-// 	},
-// 	easeInBounce: function ( x, t, b, c, d ) {
-// 		return c - $.easing.easeOutBounce( x, d - t, 0, c, d ) + b;
-// 	},
-// 	easeOutBounce: function ( x, t, b, c, d ) {
-// 		if ( ( t /= d ) < ( 1 / 2.75 ) ) {
-// 			return c * ( 7.5625 * t * t ) + b;
-// 		} else if ( t < ( 2 / 2.75 ) ) {
-// 			return c * ( 7.5625 * ( t -= ( 1.5 / 2.75 ) ) * t + .75 ) + b;
-// 		} else if ( t < ( 2.5 / 2.75 ) ) {
-// 			return c * ( 7.5625 * ( t -= ( 2.25/ 2.75 ) ) * t + .9375 ) + b;
-// 		} else {
-// 			return c * ( 7.5625 * ( t -= ( 2.625 / 2.75 ) ) * t + .984375 ) + b;
-// 		}
-// 	},
-// 	easeInOutBounce: function ( x, t, b, c, d ) {
-// 		if ( t < d / 2 ) return $.easing.easeInBounce( x, t * 2, 0, c, d ) * .5 + b;
-// 		return $.easing.easeOutBounce( x, t * 2 - d, 0, c, d ) * .5 + c * .5 + b;
-// 	}
-// });
-
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- *
- * Open source under the BSD License.
- *
- * Copyright 2001 Robert Penner
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list
- * of conditions and the following disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * Neither the name of the author nor the names of contributors may be used to endorse
- * or promote products derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+	});
 
 })(jQuery);

src/jqplot.lineRenderer.js

         //
         options = options || {};
         this._type='line';
+        this.renderer.animation = {
+            show: false,
+            direction: 'left',
+            speed: 2500,
+            _supported: true
+        };
         // prop: fillTo
         // Index of another series.  Fill between this series
         // and the fillTo series.  This will override the "fill" option.

src/jquery.jqplot.js

     };
 
 
-    var files = ['jqplot.core.js', 'jqplot.linearTickGenerator.js', 'jqplot.linearAxisRenderer.js', 'jqplot.axisTickRenderer.js', 'jqplot.axisLabelRenderer.js', 'jqplot.tableLegendRenderer.js', 'jqplot.lineRenderer.js', 'jqplot.markerRenderer.js', 'jqplot.divTitleRenderer.js', 'jqplot.canvasGridRenderer.js', 'jqplot.linePattern.js', 'jqplot.shadowRenderer.js', 'jqplot.shapeRenderer.js', 'jqplot.sprintf.js', 'jsdate.js', 'jqplot.themeEngine.js', 'jqplot.toImage.js'];
+    var files = ['jqplot.core.js', 'jqplot.linearTickGenerator.js', 'jqplot.linearAxisRenderer.js', 'jqplot.axisTickRenderer.js', 'jqplot.axisLabelRenderer.js', 'jqplot.tableLegendRenderer.js', 'jqplot.lineRenderer.js', 'jqplot.markerRenderer.js', 'jqplot.divTitleRenderer.js', 'jqplot.canvasGridRenderer.js', 'jqplot.linePattern.js', 'jqplot.shadowRenderer.js', 'jqplot.shapeRenderer.js', 'jqplot.sprintf.js', 'jsdate.js', 'jqplot.themeEngine.js', 'jqplot.toImage.js', 'jqplot.effects.core.js', 'jqplot.effects.blind.js'];
     var rn = getRootNode().root;
     for (var i=0; i<files.length; i++) {
         var pp = rn+files[i];

src/plugins/jqplot.barRenderer.js

         // Allows backward compatability of bar renderer horizontal bars with 
         // old style data sets.
         this.transposedData = true;
+        this.renderer.animation = {
+            show: false,
+            direction: 'down',
+            speed: 3000,
+            _supported: true
+        };
         this._type = 'bar';
         
         // if user has passed in highlightMouseDown option and not set highlightMouseOver, disable highlightMouseOver
             options.highlightMouseOver = false;
         }
         
+        //////
+        // This is probably wrong here.
+        // After going back and forth on wether renderer should be the thing
+        // or extend the thing, it seems that it it best if it is a property
+        // on the thing.  This should be something that is commonized 
+        // among series renderers in the future.
+        //////
         $.extend(true, this, options);
+
+        // really should probably do this
+        $.extend(true, this.renderer, options);
         // fill is still needed to properly draw the legend.
         // bars have to be filled.
         this.fill = true;
+
+        // if horizontal bar and animating, reset the default direction
+        if (this.barDirection === 'horizontal' && this.rendererOptions.animation && this.rendererOptions.animation.direction == null) {
+            this.renderer.animation.direction = 'left';
+        }
         
         if (this.waterfall) {
             this.fillToZero = false;

src/plugins/jqplot.pointLabels.js

     var oppositeLocations = ['se', 's', 'sw', 'w', 'nw', 'n', 'ne', 'e'];
     
     // called with scope of a series
-    $.jqplot.PointLabels.init = function (target, data, seriesDefaults, opts){
+    $.jqplot.PointLabels.init = function (target, data, seriesDefaults, opts, plot){
         var options = $.extend(true, {}, seriesDefaults, opts);
         options.pointLabels = options.pointLabels || {};
         if (this.renderer.constructor === $.jqplot.BarRenderer && this.barDirection === 'horizontal' && !options.pointLabels.location) {
         // add a pointLabels attribute to the series plugins
         this.plugins.pointLabels = new $.jqplot.PointLabels(options.pointLabels);
         this.plugins.pointLabels.setLabels.call(this);
+
+        if (this.renderer.animation && this.renderer.animation._supported && this.renderer.animation.show) {
+            
+        }
     };
     
     // called with scope of series
     };
     
     // called with scope of series
-    $.jqplot.PointLabels.draw = function (sctx, options) {
+    $.jqplot.PointLabels.draw = function (sctx, options, plot) {
         var p = this.plugins.pointLabels;
         // set labels again in case they have changed.
         p.setLabels.call(this);
                 if (ell - et < scl || elt - et < sct || elr + et > scr || elb + et > scb) {
                     elem.remove();
                 }
+
                 elem = null;
                 helem = null;
             }
+
+            // finally, animate them if the series is animated
+            // if (this.renderer.animation && this.renderer.animation._supported && this.renderer.animation.show && plot._drawCount < 2) {
+            //     var sel = '.jqplot-point-label.jqplot-series-'+this.index;
+            //     $(sel).hide();
+            //     $(sel).fadeIn(1000);
+            // }
+
         }
     };
     
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.