You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/03/18 14:37:31 UTC
svn commit: r1082916 [4/6] - in /ofbiz/trunk:
applications/content/widget/content/ applications/order/email/default/
applications/party/webapp/partymgr/js/ applications/product/widget/catalog/
framework/common/webcommon/includes/ framework/common/webco...
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/API.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/API.txt?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/API.txt (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/API.txt Fri Mar 18 13:37:29 2011
@@ -172,6 +172,7 @@ Customizing the axes
====================
xaxis, yaxis: {
+ show: null or true/false
position: "bottom" or "top" or "left" or "right"
mode: null or "time"
@@ -193,6 +194,7 @@ Customizing the axes
labelWidth: null or number
labelHeight: null or number
+ reserveSpace: null or true
tickLength: null or number
@@ -203,6 +205,11 @@ All axes have the same kind of options.
configure one axis, see below for what to do if you've got more than
one x axis or y axis.
+If you don't set the "show" option (i.e. it is null), visibility is
+auto-detected, i.e. the axis will show up if there's data associated
+with it. You can override this by setting the "show" option to true or
+false.
+
The "position" option specifies where the axis is placed, bottom or
top for x axes, left or right for y axes. The "mode" option determines
how the data is interpreted, the default of null means as decimal
@@ -217,7 +224,10 @@ transparency).
The options "min"/"max" are the precise minimum/maximum value on the
scale. If you don't specify either of them, a value will automatically
-be chosen based on the minimum/maximum data values.
+be chosen based on the minimum/maximum data values. Note that Flot
+always examines all the data values you feed to it, even if a
+restriction on another axis may make some of them invisible (this
+makes interactive use more stable).
The "autoscaleMargin" is a bit esoteric: it's the fraction of margin
that the scaling algorithm will add to avoid that the outermost points
@@ -240,6 +250,14 @@ into a natural logarithm axis with the f
inverseTransform: function (v) { return Math.exp(v); }
}
+Similarly, for reversing the y axis so the values appear in inverse
+order:
+
+ yaxis: {
+ transform: function (v) { return -v; },
+ inverseTransform: function (v) { return -v; }
+ }
+
Note that for finding extrema, Flot assumes that the transform
function does not reorder values (it should be monotone).
@@ -303,7 +321,7 @@ number of decimals to display (default i
Alternatively, for ultimate control over how ticks are formatted you can
provide a function to "tickFormatter". The function is passed two
-parameters, the tick value and an "axis" object with information, and
+parameters, the tick value and an axis object with information, and
should return a string. The default formatter looks like this:
function formatter(val, axis) {
@@ -327,7 +345,9 @@ an example of a custom formatter:
"labelWidth" and "labelHeight" specifies a fixed size of the tick
labels in pixels. They're useful in case you need to align several
-plots.
+plots. "reserveSpace" means that even if an axis isn't shown, Flot
+should reserve space for it - it is useful in combination with
+labelWidth and labelHeight for aligning multi-axis charts.
"tickLength" is the length of the tick lines in pixels. By default, the
innermost axes will have ticks that extend all across the plot, while
@@ -637,6 +657,7 @@ Customizing the grid
markings: array of markings or (fn: axes -> array of markings)
borderWidth: number
borderColor: color or null
+ minBorderMargin: number or null
clickable: boolean
hoverable: boolean
autoHighlight: boolean
@@ -658,9 +679,14 @@ above the data or below (below is defaul
line, and "axisMargin" is the space in pixels between axes when there
are two next to each other. Note that you can style the tick labels
with CSS, e.g. to change the color. They have class "tickLabel".
+
"borderWidth" is the width of the border around the plot. Set it to 0
to disable the border. You can also set "borderColor" if you want the
border to have a different color than the grid lines.
+"minBorderMargin" controls the default minimum margin around the
+border - it's used to make sure that points aren't accidentally
+clipped by the canvas edge so by default the value is computed from
+the point radius.
"markings" is used to draw simple lines and rectangular areas in the
background of the plot. You can either specify an array of ranges on
@@ -851,7 +877,8 @@ can call:
interactive things like a selection and point highlights. This
is mostly useful for writing plugins. The redraw doesn't happen
immediately, instead a timer is set to catch multiple successive
- redraws (e.g. from a mousemove).
+ redraws (e.g. from a mousemove). You can get to the overlay by
+ setting up a drawOverlay hook.
- width()/height()
@@ -874,7 +901,19 @@ can call:
o = pointOffset({ x: xpos, y: ypos, xaxis: 2, yaxis: 3 })
// o.left and o.top now contains the offset within the div
-
+
+ - resize()
+
+ Tells Flot to resize the drawing canvas to the size of the
+ placeholder. You need to run setupGrid() and draw() afterwards as
+ canvas resizing is a destructive operation. This is used
+ internally by the resize plugin.
+
+ - shutdown()
+
+ Cleans up any event handlers Flot has currently registered. This
+ is used internally.
+
There are also some members that let you peek inside the internal
workings of Flot which is useful in some cases. Note that if you change
@@ -914,7 +953,8 @@ Flot to keep track of its state, so be c
With multiple axes, the extra axes are returned as x2axis, x3axis,
etc., e.g. getAxes().y2axis is the second y axis. You can check
- y2axis.used to see whether the axis is actually in use or not.
+ y2axis.used to see whether the axis is associated with any data
+ points and y2axis.show to see if it is currently shown.
- getPlaceholder()
@@ -936,8 +976,11 @@ Flot to keep track of its state, so be c
- getOptions()
- Gets the options for the plot, in a normalized format with default
- values filled in.
+ Gets the options for the plot, normalized, with default values
+ filled in. You get a reference to actual values used by Flot, so
+ if you modify the values in here, Flot will use the new values.
+ If you change something, you probably have to call draw() or
+ setupGrid() or triggerRedrawOverlay() to see the change.
Hooks
@@ -967,6 +1010,8 @@ Here's an overview of the phases Flot go
7. Responding to events, if any
+ 8. Shutdown: this mostly happens in case a plot is overwritten
+
Each hook is simply a function which is put in the appropriate array.
You can add them through the "hooks" option, and they are also available
after the plot is constructed as the "hooks" attribute on the returned
@@ -1115,6 +1160,16 @@ hooks in the plugins bundled with Flot.
crosshair plugin for an example.
+ - shutdown [phase 8]
+
+ function (plot, eventHolder)
+
+ Run when plot.shutdown() is called, which usually only happens in
+ case a plot is overwritten by a new plot. If you're writing a
+ plugin that adds extra DOM elements or event handlers, you should
+ add a callback to clean up after you. Take a look at the section in
+ PLUGINS.txt for more info.
+
Plugins
-------
@@ -1132,9 +1187,15 @@ Here's a brief explanation of how the pl
Each plugin registers itself in the global array $.plot.plugins. When
you make a new plot object with $.plot, Flot goes through this array
calling the "init" function of each plugin and merging default options
-from its "option" attribute. The init function gets a reference to the
-plot object created and uses this to register hooks and add new public
-methods if needed.
+from the "option" attribute of the plugin. The init function gets a
+reference to the plot object created and uses this to register hooks
+and add new public methods if needed.
See the PLUGINS.txt file for details on how to write a plugin. As the
above description hints, it's actually pretty easy.
+
+
+Version number
+--------------
+
+The version number of Flot is available in $.plot.version.
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt Fri Mar 18 13:37:29 2011
@@ -22,8 +22,11 @@ becomes
Note that if you're just using one axis, continue to use the
xaxis/yaxis directly (it now sets the default settings for the
arrays). Plugins touching the axes must be ported to take the extra
-axes into account, a couple of helper functions have been added for
-that purpose, check the source.
+axes into account, check the source to see some examples.
+
+A related change is that the visibility of axes is now auto-detected.
+So if you were relying on an axis to show up even without any data in
+the chart, you now need to set the axis "show" option explicitly.
"tickColor" on the grid options is now deprecated in favour of a
corresponding option on the axes, so { grid: { tickColor: "#000" }}
@@ -32,6 +35,15 @@ but if you just configure a base color F
tick color by adding transparency. Backwards-compatibility hooks are
in place.
+Final note: now that IE 9 is coming out with canvas support, you may
+want to adapt the excanvas include to skip loading it in IE 9 (the
+examples have been adapted thanks to Ryley Breiddal). An alternative
+to excanvas using Flash has also surfaced, if your graphs are slow in
+IE, you may want to give it a spin:
+
+ http://code.google.com/p/flashcanvas/
+
+
Changes:
- Support for specifying a bottom for each point for line charts when
@@ -67,8 +79,31 @@ Changes:
- Support for customizing the point type through a callback when
plotting points and new symbol plugin with some predefined point
types (sponsored by Utility Data Corporation).
+- Resize plugin for automatically redrawing when the placeholder
+ changes size, e.g. on window resizes (sponsored by Novus Partners).
+ A resize() method has been added to plot object facilitate this.
+- Support Infinity/-Infinity for plotting asymptotes by hacking it
+ into +/-Number.MAX_VALUE (reported by rabaea.mircea).
+- Support for restricting navigate plugin to not pan/zoom an axis (based
+ on patch by kkaefer).
+- Support for providing the drag cursor for the navigate plugin as an
+ option (based on patch by Kelly T. Moore).
+- Options for controlling whether an axis is shown or not (suggestion
+ by Timo Tuominen) and whether to reserve space for it even if it
+ isn't shown.
+- New attribute $.plot.version with the Flot version as a string.
+- The version comment is now included in the minified jquery.flot.min.js.
+- New options.grid.minBorderMargin for adjusting the minimum margin
+ provided around the border (based on patch by corani, issue 188).
+- Refactor replot behaviour so Flot tries to reuse the existing
+ canvas, adding shutdown() methods to the plot (based on patch by
+ Ryley Breiddal, issue 269). This prevents a memory leak in Chrome
+ and hopefully makes replotting faster for those who are using $.plot
+ instead of .setData()/.draw(). Also update jQuery to 1.5.1 to
+ prevent IE leaks fixed in jQuery.
+- New real-time line chart example.
-- New hooks: drawSeries
+- New hooks: drawSeries, shutdown
Bug fixes:
@@ -80,7 +115,8 @@ Bug fixes:
- Fixed a problem introduced in 0.6 with specifying a gradient with {
brightness: x, opacity: y }.
- Don't use $.browser.msie, check for getContext on the created canvas
- element instead and try to use excanvas if it's not found.
+ element instead and try to use excanvas if it's not found (fixes IE
+ 9 compatibility).
- highlight(s, index) was looking up the point in the original s.data
instead of in the computed datapoints array, which breaks with
plugins that modify the datapoints (such as the stacking plugin).
@@ -93,9 +129,42 @@ Bug fixes:
plugin, to guard against errors when synchronizing plots (fix by Lau
Bech Lauritzen).
- Fix bug in crosshair code with mouseout resetting the crosshair even
- if it is locked (fix by Lau Bech Lauritzen).
+ if it is locked (fix by Lau Bech Lauritzen and Banko Adam).
- Fix bug with points plotting using line width from lines rather than
points.
+- Fix bug with passing non-array 0 data (for plugins that don't expect
+ arrays, patch by vpapp1).
+- Fix errors in JSON in examples so they work with jQuery 1.4.2
+ (fix reported by honestbleeps, issue 357).
+- Fix bug with tooltip in interacting.html, this makes the tooltip
+ much smoother (fix by bdkahn). Fix related bug inside highlighting
+ handler in Flot.
+- Use closure trick to make inline colorhelpers plugin respect
+ jQuery.noConflict(true), renaming the global jQuery object (reported
+ by Nick Stielau).
+- Listen for mouseleave events and fire a plothover event with empty
+ item when it occurs to drop highlights when the mouse leaves the
+ plot (reported by by outspirit).
+- Fix bug with using aboveData with a background (reported by
+ amitayd).
+- Fix possible excanvas leak (report and suggested fix by tom9729).
+- Fix bug with backwards compatibility for shadowSize = 0 (report and
+ suggested fix by aspinak).
+- Adapt examples to skip loading excanvas (fix by Ryley Breiddal).
+- Fix bug that prevent a simple f(x) = -x transform from working
+ correctly (fix by Mike, issue 263).
+- Fix bug in restoring cursor in navigate plugin (reported by Matteo
+ Gattanini, issue 395).
+- Fix bug in picking items when transform/inverseTransform is in use
+ (reported by Ofri Raviv, and patches and analysis by Jan and Tom
+ Paton, issue 334 and 467).
+- Fix problem with unaligned ticks and hover/click events caused by
+ padding on the placeholder by hardcoding the placeholder padding to
+ 0 (reported by adityadineshsaxena, Matt Sommer, Daniel Atos and some
+ other people, issue 301).
+- Update colorhelpers plugin to avoid dying when trying to parse an
+ invalid string (reported by cadavor, issue 483).
+
Flot 0.6
--------
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt Fri Mar 18 13:37:29 2011
@@ -1,20 +1,22 @@
Writing plugins
---------------
-To make a new plugin, create an init function and a set of options (if
-needed), stuff it into an object and put it in the $.plot.plugins
-array. For example:
-
- function myCoolPluginInit(plot) { plot.coolstring = "Hello!" };
- var myCoolOptions = { coolstuff: { show: true } }
- $.plot.plugins.push({ init: myCoolPluginInit, options: myCoolOptions });
+All you need to do to make a new plugin is creating an init function
+and a set of options (if needed), stuffing it into an object and
+putting it in the $.plot.plugins array. For example:
- // now when $.plot is called, the returned object will have the
+ function myCoolPluginInit(plot) {
+ plot.coolstring = "Hello!";
+ };
+
+ $.plot.plugins.push({ init: myCoolPluginInit, options: { ... } });
+
+ // if $.plot is called, it will return a plot object with the
// attribute "coolstring"
Now, given that the plugin might run in many different places, it's
-a good idea to avoid leaking names. We can avoid this by wrapping the
-above lines in an anonymous function which we call immediately, like
+a good idea to avoid leaking names. The usual trick here is wrap the
+above lines in an anonymous function which is called immediately, like
this: (function () { inner code ... })(). To make it even more robust
in case $ is not bound to jQuery but some other Javascript library, we
can write it as
@@ -24,6 +26,13 @@ can write it as
// ...
})(jQuery);
+There's a complete example below, but you should also check out the
+plugins bundled with Flot.
+
+
+Complete example
+----------------
+
Here is a simple debug plugin which alerts each of the series in the
plot. It has a single option that control whether it is enabled and
how much info to output:
@@ -75,16 +84,41 @@ This simple plugin illustrates a couple
- Variables in the init function can be used to store plot-specific
state between the hooks.
+The two last points are important because there may be multiple plots
+on the same page, and you'd want to make sure they are not mixed up.
+
+
+Shutting down a plugin
+----------------------
+
+Each plot object has a shutdown hook which is run when plot.shutdown()
+is called. This usually mostly happens in case another plot is made on
+top of an existing one.
+
+The purpose of the hook is to give you a chance to unbind any event
+handlers you've registered and remove any extra DOM things you've
+inserted.
+
+The problem with event handlers is that you can have registered a
+handler which is run in some point in the future, e.g. with
+setTimeout(). Meanwhile, the plot may have been shutdown and removed,
+but because your event handler is still referencing it, it can't be
+garbage collected yet, and worse, if your handler eventually runs, it
+may overwrite stuff on a completely different plot.
+
-Options guidelines
-==================
+Some hints on the options
+-------------------------
Plugins should always support appropriate options to enable/disable
them because the plugin user may have several plots on the same page
-where only one should use the plugin.
-
-If the plugin needs series-specific options, you can put them in
-"series" in the options object, e.g.
+where only one should use the plugin. In most cases it's probably a
+good idea if the plugin is turned off rather than on per default, just
+like most of the powerful features in Flot.
+
+If the plugin needs options that are specific to each series, like the
+points or lines options in core Flot, you can put them in "series" in
+the options object, e.g.
var options = {
series: {
@@ -95,10 +129,8 @@ If the plugin needs series-specific opti
}
}
-Then they will be copied by Flot into each series, providing the
-defaults in case the plugin user doesn't specify any. Again, in most
-cases it's probably a good idea if the plugin is turned off rather
-than on per default, just like most of the powerful features in Flot.
+Then they will be copied by Flot into each series, providing default
+values in case none are specified.
Think hard and long about naming the options. These names are going to
be public API, and code is going to depend on them if the plugin is
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/README.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/README.txt?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/README.txt (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/README.txt Fri Mar 18 13:37:29 2011
@@ -16,20 +16,29 @@ Installation
Just include the Javascript file after you've included jQuery.
-Note that you need to get a version of Excanvas (e.g. the one bundled
-with Flot) which is canvas emulation on Internet Explorer. You can
+Generally, all browsers that support the HTML5 canvas tag are
+supported.
+
+For support for Internet Explorer < 9, you can use Excanvas, a canvas
+emulator; this is used in the examples bundled with Flot. You just
include the excanvas script like this:
- <!--[if IE]><script language="javascript" type="text/javascript" src="excanvas.pack.js"></script><![endif]-->
+ <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="excanvas.min.js"></script><![endif]-->
If it's not working on your development IE 6.0, check that it has
-support for VML which excanvas is relying on. It appears that some
+support for VML which Excanvas is relying on. It appears that some
stripped down versions used for test environments on virtual machines
lack the VML support.
-
-Also note that you need at least jQuery 1.2.6 (but at least jQuery
-1.3.2 is recommended for interactive charts because of performance
-improvements in event handling).
+
+You can also try using Flashcanvas (see
+http://code.google.com/p/flashcanvas/), which uses Flash to do the
+emulation. Although Flash can be a bit slower to load than VML, if
+you've got a lot of points, the Flash version can be much faster
+overall. Flot contains some wrapper code for activating Excanvas which
+Flashcanvas is compatible with.
+
+You need at least jQuery 1.2.6, but try at least 1.3.2 for interactive
+charts because of performance improvements in event handling.
Basic usage
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js Fri Mar 18 13:37:29 2011
@@ -1,6 +1,6 @@
/* Plugin for jQuery for working with colors.
*
- * Version 1.0.
+ * Version 1.1.
*
* Inspiration from jQuery color animation plugin by John Resig.
*
@@ -13,15 +13,18 @@
* console.log(c.r, c.g, c.b, c.a);
* $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
*
- * Note that .scale() and .add() work in-place instead of returning
- * new objects.
+ * Note that .scale() and .add() return the same modified object
+ * instead of making a new one.
+ *
+ * V. 1.1: Fix error handling so e.g. parsing an empty string does
+ * produce a color rather than just crashing.
*/
-(function() {
- jQuery.color = {};
+(function($) {
+ $.color = {};
// construct color object with some convenient chainable helpers
- jQuery.color.make = function (r, g, b, a) {
+ $.color.make = function (r, g, b, a) {
var o = {};
o.r = r || 0;
o.g = g || 0;
@@ -61,7 +64,7 @@
};
o.clone = function () {
- return jQuery.color.make(o.r, o.b, o.g, o.a);
+ return $.color.make(o.r, o.b, o.g, o.a);
};
return o.normalize();
@@ -69,7 +72,7 @@
// extract CSS color property from element, going up in the DOM
// if it's "transparent"
- jQuery.color.extract = function (elem, css) {
+ $.color.extract = function (elem, css) {
var c;
do {
c = elem.css(css).toLowerCase();
@@ -78,19 +81,20 @@
if (c != '' && c != 'transparent')
break;
elem = elem.parent();
- } while (!jQuery.nodeName(elem.get(0), "body"));
+ } while (!$.nodeName(elem.get(0), "body"));
// catch Safari's way of signalling transparent
if (c == "rgba(0, 0, 0, 0)")
c = "transparent";
- return jQuery.color.parse(c);
+ return $.color.parse(c);
}
// parse CSS color string (like "rgb(10, 32, 43)" or "#fff"),
- // returns color object
- jQuery.color.parse = function (str) {
- var res, m = jQuery.color.make;
+ // returns color object, if parsing failed, you get black (0, 0,
+ // 0) out
+ $.color.parse = function (str) {
+ var res, m = $.color.make;
// Look for rgb(num,num,num)
if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))
@@ -117,11 +121,12 @@
return m(parseInt(res[1]+res[1], 16), parseInt(res[2]+res[2], 16), parseInt(res[3]+res[3], 16));
// Otherwise, we're most likely dealing with a named color
- var name = jQuery.trim(str).toLowerCase();
+ var name = $.trim(str).toLowerCase();
if (name == "transparent")
return m(255, 255, 255, 0);
else {
- res = lookupColors[name];
+ // default to black
+ res = lookupColors[name] || [0, 0, 0];
return m(res[0], res[1], res[2]);
}
}
@@ -170,5 +175,5 @@
silver:[192,192,192],
white:[255,255,255],
yellow:[255,255,0]
- };
-})();
+ };
+})(jQuery);
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js Fri Mar 18 13:37:29 2011
@@ -90,34 +90,37 @@ The plugin also adds four public methods
crosshair.locked = false;
}
- plot.hooks.bindEvents.push(function (plot, eventHolder) {
- if (!plot.getOptions().crosshair.mode)
+ function onMouseOut(e) {
+ if (crosshair.locked)
return;
- eventHolder.mouseout(function () {
- if (crosshair.locked)
- return;
-
- if (crosshair.x != -1) {
- crosshair.x = -1;
- plot.triggerRedrawOverlay();
- }
- });
-
- eventHolder.mousemove(function (e) {
- if (crosshair.locked)
- return;
+ if (crosshair.x != -1) {
+ crosshair.x = -1;
+ plot.triggerRedrawOverlay();
+ }
+ }
+
+ function onMouseMove(e) {
+ if (crosshair.locked)
+ return;
- if (plot.getSelection && plot.getSelection()) {
- crosshair.x = -1; // hide the crosshair while selecting
- return;
- }
+ if (plot.getSelection && plot.getSelection()) {
+ crosshair.x = -1; // hide the crosshair while selecting
+ return;
+ }
- var offset = plot.offset();
- crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
- crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
- plot.triggerRedrawOverlay();
- });
+ var offset = plot.offset();
+ crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
+ crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
+ plot.triggerRedrawOverlay();
+ }
+
+ plot.hooks.bindEvents.push(function (plot, eventHolder) {
+ if (!plot.getOptions().crosshair.mode)
+ return;
+
+ eventHolder.mouseout(onMouseOut);
+ eventHolder.mousemove(onMouseMove);
});
plot.hooks.drawOverlay.push(function (plot, ctx) {
@@ -148,6 +151,11 @@ The plugin also adds four public methods
}
ctx.restore();
});
+
+ plot.hooks.shutdown.push(function (plot, eventHolder) {
+ eventHolder.unbind("mouseout", onMouseOut);
+ eventHolder.unbind("mousemove", onMouseMove);
+ });
}
$.plot.plugins.push({
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js Fri Mar 18 13:37:29 2011
@@ -1,4 +1,4 @@
-/* Javascript plotting library for jQuery, v. 0.6.
+/*! Javascript plotting library for jQuery, v. 0.6.
*
* Released under the MIT license by IOLA, December 2007.
*
@@ -9,7 +9,7 @@
/* Plugin for jQuery for working with colors.
*
- * Version 1.0.
+ * Version 1.1.
*
* Inspiration from jQuery color animation plugin by John Resig.
*
@@ -22,10 +22,13 @@
* console.log(c.r, c.g, c.b, c.a);
* $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
*
- * Note that .scale() and .add() work in-place instead of returning
- * new objects.
+ * Note that .scale() and .add() return the same modified object
+ * instead of making a new one.
+ *
+ * V. 1.1: Fix error handling so e.g. parsing an empty string does
+ * produce a color rather than just crashing.
*/
-(function(){jQuery.color={};jQuery.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]+=H}return F.normalize()};F.scale=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]*=H}return F.normalize()};F.toString=function(){if(F.a>=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return J<I?I:(J>H?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return jQuery.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};jQuery.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!jQuery.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return jQuery.color.parse(D)};jQuery.color.parse=function(E){var D,B=jQuery.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s
*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3
],16))}var C=jQuery.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={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:[25
5,255,0]}})();
+(function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]+=I}return G.normalize()};G.scale=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]*=I}return G.normalize()};G.toString=function(){if(G.a>=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return K<J?J:(K>I?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*
\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}var D=B.trim(F).toLowerCase();if
(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={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]}})(jQuery);
// the actual Flot code
(function($) {
@@ -51,6 +54,7 @@
backgroundOpacity: 0.85 // set to 0 to avoid background
},
xaxis: {
+ show: null, // null = auto-detect, true = always, false = never
position: "bottom", // or "top"
mode: null, // null or "time"
color: null, // base color, labels, ticks
@@ -64,6 +68,7 @@
tickFormatter: null, // fn: number -> string
labelWidth: null, // size of tick labels in pixels
labelHeight: null,
+ reserveSpace: null, // whether to reserve space even if axis isn't shown
tickLength: null, // size in pixels of ticks, or "full" for whole line
alignTicksWithAxis: null, // axis number or null for no sync
@@ -119,6 +124,7 @@
labelMargin: 5, // in pixels
axisMargin: 8, // in pixels
borderWidth: 2, // in pixels
+ minBorderMargin: null, // in pixels, null means taken from points radius
markings: null, // array of ranges or fn: axes -> array of ranges
markingsColor: "#f4f4f4",
markingsLineWidth: 2,
@@ -145,7 +151,8 @@
drawSeries: [],
draw: [],
bindEvents: [],
- drawOverlay: []
+ drawOverlay: [],
+ shutdown: []
},
plot = this;
@@ -165,30 +172,16 @@
return o;
};
plot.getData = function () { return series; };
- plot.getAxis = function (dir, number) {
- var a = (dir == x ? xaxes : yaxes)[number - 1];
- if (a && !a.used)
- a = null;
- return a;
- };
plot.getAxes = function () {
var res = {}, i;
- for (i = 0; i < xaxes.length; ++i)
- res["x" + (i ? (i + 1) : "") + "axis"] = xaxes[i] || {};
- for (i = 0; i < yaxes.length; ++i)
- res["y" + (i ? (i + 1) : "") + "axis"] = yaxes[i] || {};
-
- // backwards compatibility - to be removed
- if (!res.x2axis)
- res.x2axis = { n: 2 };
- if (!res.y2axis)
- res.y2axis = { n: 2 };
-
+ $.each(xaxes.concat(yaxes), function (_, axis) {
+ if (axis)
+ res[axis.direction + (axis.n != 1 ? axis.n : "") + "axis"] = axis;
+ });
return res;
};
plot.getXAxes = function () { return xaxes; };
plot.getYAxes = function () { return yaxes; };
- plot.getUsedAxes = getUsedAxes; // return flat array with x and y axes that are in use
plot.c2p = canvasToAxisCoords;
plot.p2c = axisToCanvasCoords;
plot.getOptions = function () { return options; };
@@ -201,6 +194,12 @@
top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top)
};
};
+ plot.shutdown = shutdown;
+ plot.resize = function () {
+ getCanvasDimensions();
+ resizeCanvas(canvas);
+ resizeCanvas(overlay);
+ };
// public attributes
plot.hooks = hooks;
@@ -208,7 +207,7 @@
// initialize
initPlugins(plot);
parseOptions(options_);
- constructCanvas();
+ setupCanvases();
setData(data_);
setupGrid();
draw();
@@ -256,20 +255,19 @@
options.xaxes[i] = $.extend(true, {}, options.xaxis, options.xaxes[i]);
for (i = 0; i < Math.max(1, options.yaxes.length); ++i)
options.yaxes[i] = $.extend(true, {}, options.yaxis, options.yaxes[i]);
+
// backwards compatibility, to be removed in future
if (options.xaxis.noTicks && options.xaxis.ticks == null)
options.xaxis.ticks = options.xaxis.noTicks;
if (options.yaxis.noTicks && options.yaxis.ticks == null)
options.yaxis.ticks = options.yaxis.noTicks;
if (options.x2axis) {
- options.x2axis.position = "top";
- options.xaxes[1] = options.x2axis;
+ options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis);
+ options.xaxes[1].position = "top";
}
if (options.y2axis) {
- if (options.y2axis.autoscaleMargin === undefined)
- options.y2axis.autoscaleMargin = 0.02;
- options.y2axis.position = "right";
- options.yaxes[1] = options.y2axis;
+ options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis);
+ options.yaxes[1].position = "right";
}
if (options.grid.coloredAreas)
options.grid.markings = options.grid.coloredAreas;
@@ -281,9 +279,10 @@
$.extend(true, options.series.points, options.points);
if (options.bars)
$.extend(true, options.series.bars, options.bars);
- if (options.shadowSize)
+ if (options.shadowSize != null)
options.series.shadowSize = options.shadowSize;
+ // save options on axes for future reference
for (i = 0; i < options.xaxes.length; ++i)
getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i];
for (i = 0; i < options.yaxes.length; ++i)
@@ -308,7 +307,7 @@
for (var i = 0; i < d.length; ++i) {
var s = $.extend(true, {}, options.series);
- if (d[i].data) {
+ if (d[i].data != null) {
s.data = d[i].data; // move the data instead of deep-copy
delete d[i].data;
@@ -333,6 +332,11 @@
return a;
}
+ function allAxes() {
+ // return flat array without annoying null entries
+ return $.grep(xaxes.concat(yaxes), function (a) { return a; });
+ }
+
function canvasToAxisCoords(pos) {
// return an object with x/y corresponding to all used axes
var res = {}, i, axis;
@@ -367,7 +371,7 @@
if (pos[key] == null && axis.n == 1)
key = "x";
- if (pos[key]) {
+ if (pos[key] != null) {
res.left = axis.p2c(pos[key]);
break;
}
@@ -381,7 +385,7 @@
if (pos[key] == null && axis.n == 1)
key = "y";
- if (pos[key]) {
+ if (pos[key] != null) {
res.top = axis.p2c(pos[key]);
break;
}
@@ -391,21 +395,6 @@
return res;
}
- function getUsedAxes() {
- var res = [], i, axis;
- for (i = 0; i < xaxes.length; ++i) {
- axis = xaxes[i];
- if (axis && axis.used)
- res.push(axis);
- }
- for (i = 0; i < yaxes.length; ++i) {
- axis = yaxes[i];
- if (axis && axis.used)
- res.push(axis);
- }
- return res;
- }
-
function getOrCreateAxis(axes, number) {
if (!axes[number - 1])
axes[number - 1] = {
@@ -500,29 +489,23 @@
function processData() {
var topSentry = Number.POSITIVE_INFINITY,
bottomSentry = Number.NEGATIVE_INFINITY,
+ fakeInfinity = Number.MAX_VALUE,
i, j, k, m, length,
s, points, ps, x, y, axis, val, f, p;
- function initAxis(axis, number) {
- if (!axis)
- return;
-
- axis.datamin = topSentry;
- axis.datamax = bottomSentry;
- axis.used = false;
- }
-
function updateAxis(axis, min, max) {
- if (min < axis.datamin)
+ if (min < axis.datamin && min != -fakeInfinity)
axis.datamin = min;
- if (max > axis.datamax)
+ if (max > axis.datamax && max != fakeInfinity)
axis.datamax = max;
}
- for (i = 0; i < xaxes.length; ++i)
- initAxis(xaxes[i]);
- for (i = 0; i < yaxes.length; ++i)
- initAxis(yaxes[i]);
+ $.each(allAxes(), function (_, axis) {
+ // init axis
+ axis.datamin = topSentry;
+ axis.datamax = bottomSentry;
+ axis.used = false;
+ });
for (i = 0; i < series.length; ++i) {
s = series[i];
@@ -579,6 +562,10 @@
val = +val; // convert to number
if (isNaN(val))
val = null;
+ else if (val == Infinity)
+ val = fakeInfinity;
+ else if (val == -Infinity)
+ val = -fakeInfinity;
}
if (val == null) {
@@ -653,7 +640,7 @@
for (m = 0; m < ps; ++m) {
val = points[j + m];
f = format[m];
- if (!f)
+ if (!f || val == fakeInfinity || val == -fakeInfinity)
continue;
if (f.x) {
@@ -688,7 +675,7 @@
updateAxis(s.yaxis, ymin, ymax);
}
- $.each(getUsedAxes(), function (i, axis) {
+ $.each(allAxes(), function (_, axis) {
if (axis.datamin == topSentry)
axis.datamin = null;
if (axis.datamax == bottomSentry)
@@ -696,46 +683,115 @@
});
}
- function constructCanvas() {
- function makeCanvas(width, height) {
- var c = document.createElement('canvas');
- c.width = width;
- c.height = height;
- if (!c.getContext) // excanvas hack
- c = window.G_vmlCanvasManager.initElement(c);
- return c;
- }
+ function makeCanvas(skipPositioning, cls) {
+ var c = document.createElement('canvas');
+ c.className = cls;
+ c.width = canvasWidth;
+ c.height = canvasHeight;
+
+ if (!skipPositioning)
+ $(c).css({ position: 'absolute', left: 0, top: 0 });
+
+ $(c).appendTo(placeholder);
+
+ if (!c.getContext) // excanvas hack
+ c = window.G_vmlCanvasManager.initElement(c);
+
+ // used for resetting in case we get replotted
+ c.getContext("2d").save();
+ return c;
+ }
+
+ function getCanvasDimensions() {
canvasWidth = placeholder.width();
canvasHeight = placeholder.height();
- placeholder.html(""); // clear placeholder
- if (placeholder.css("position") == 'static')
- placeholder.css("position", "relative"); // for positioning labels and overlay
-
+
if (canvasWidth <= 0 || canvasHeight <= 0)
throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight;
+ }
+
+ function resizeCanvas(c) {
+ // resizing should reset the state (excanvas seems to be
+ // buggy though)
+ if (c.width != canvasWidth)
+ c.width = canvasWidth;
- if (window.G_vmlCanvasManager) // excanvas hack
- window.G_vmlCanvasManager.init_(document); // make sure everything is setup
+ if (c.height != canvasHeight)
+ c.height = canvasHeight;
+
+ // so try to get back to the initial state (even if it's
+ // gone now, this should be safe according to the spec)
+ var cctx = c.getContext("2d");
+ cctx.restore();
+
+ // and save again
+ cctx.save();
+ }
+
+ function setupCanvases() {
+ var reused,
+ existingCanvas = placeholder.children("canvas.base"),
+ existingOverlay = placeholder.children("canvas.overlay");
+
+ if (existingCanvas.length == 0 || existingOverlay == 0) {
+ // init everything
+
+ placeholder.html(""); // make sure placeholder is clear
- // the canvas
- canvas = $(makeCanvas(canvasWidth, canvasHeight)).appendTo(placeholder).get(0);
- ctx = canvas.getContext("2d");
+ placeholder.css({ padding: 0 }); // padding messes up the positioning
+
+ if (placeholder.css("position") == 'static')
+ placeholder.css("position", "relative"); // for positioning labels and overlay
- // overlay canvas for interactive features
- overlay = $(makeCanvas(canvasWidth, canvasHeight)).css({ position: 'absolute', left: 0, top: 0 }).appendTo(placeholder).get(0);
+ getCanvasDimensions();
+
+ canvas = makeCanvas(true, "base");
+ overlay = makeCanvas(false, "overlay"); // overlay canvas for interactive features
+
+ reused = false;
+ }
+ else {
+ // reuse existing elements
+
+ canvas = existingCanvas.get(0);
+ overlay = existingOverlay.get(0);
+
+ reused = true;
+ }
+
+ ctx = canvas.getContext("2d");
octx = overlay.getContext("2d");
- octx.stroke();
- }
- function bindEvents() {
// we include the canvas in the event holder too, because IE 7
// sometimes has trouble with the stacking order
eventHolder = $([overlay, canvas]);
+ if (reused) {
+ // run shutdown in the old plot object
+ placeholder.data("plot").shutdown();
+
+ // reset reused canvases
+ plot.resize();
+
+ // make sure overlay pixels are cleared (canvas is cleared when we redraw)
+ octx.clearRect(0, 0, canvasWidth, canvasHeight);
+
+ // then whack any remaining obvious garbage left
+ eventHolder.unbind();
+ placeholder.children().not([canvas, overlay]).remove();
+ }
+
+ // save in case we get replotted
+ placeholder.data("plot", plot);
+ }
+
+ function bindEvents() {
// bind events
- if (options.grid.hoverable)
+ if (options.grid.hoverable) {
eventHolder.mousemove(onMouseMove);
+ eventHolder.mouseleave(onMouseLeave);
+ }
if (options.grid.clickable)
eventHolder.click(onClick);
@@ -743,6 +799,17 @@
executeHooks(hooks.bindEvents, [eventHolder]);
}
+ function shutdown() {
+ if (redrawTimeout)
+ clearTimeout(redrawTimeout);
+
+ eventHolder.unbind("mousemove", onMouseMove);
+ eventHolder.unbind("mouseleave", onMouseLeave);
+ eventHolder.unbind("click", onClick);
+
+ executeHooks(hooks.shutdown, [eventHolder]);
+ }
+
function setTransformationHelpers(axis) {
// set helper functions on the axis, assumes plot area
// has been computed already
@@ -752,42 +819,31 @@
var s, m, t = axis.options.transform || identity,
it = axis.options.inverseTransform;
+ // precompute how much the axis is scaling a point
+ // in canvas space
if (axis.direction == "x") {
- // precompute how much the axis is scaling a point
- // in canvas space
- s = axis.scale = plotWidth / (t(axis.max) - t(axis.min));
- m = t(axis.min);
-
- // data point to canvas coordinate
- if (t == identity) // slight optimization
- axis.p2c = function (p) { return (p - m) * s; };
- else
- axis.p2c = function (p) { return (t(p) - m) * s; };
- // canvas coordinate to data point
- if (!it)
- axis.c2p = function (c) { return m + c / s; };
- else
- axis.c2p = function (c) { return it(m + c / s); };
+ s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min));
+ m = Math.min(t(axis.max), t(axis.min));
}
else {
- s = axis.scale = plotHeight / (t(axis.max) - t(axis.min));
- m = t(axis.max);
-
- if (t == identity)
- axis.p2c = function (p) { return (m - p) * s; };
- else
- axis.p2c = function (p) { return (m - t(p)) * s; };
- if (!it)
- axis.c2p = function (c) { return m - c / s; };
- else
- axis.c2p = function (c) { return it(m - c / s); };
+ s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min));
+ s = -s;
+ m = Math.max(t(axis.max), t(axis.min));
}
+
+ // data point to canvas coordinate
+ if (t == identity) // slight optimization
+ axis.p2c = function (p) { return (p - m) * s; };
+ else
+ axis.p2c = function (p) { return (t(p) - m) * s; };
+ // canvas coordinate to data point
+ if (!it)
+ axis.c2p = function (c) { return m + c / s; };
+ else
+ axis.c2p = function (c) { return it(m + c / s); };
}
function measureTickLabels(axis) {
- if (!axis)
- return;
-
var opts = axis.options, i, ticks = axis.ticks || [], labels = [],
l, w = opts.labelWidth, h = opts.labelHeight, dummyDiv;
@@ -847,15 +903,12 @@
w = 0;
if (h == null)
h = 0;
-
+
axis.labelWidth = w;
axis.labelHeight = h;
}
- function computeAxisBox(axis) {
- if (!axis || (!axis.used && !(axis.labelWidth || axis.labelHeight)))
- return;
-
+ function allocateAxisBoxFirstPhase(axis) {
// find the bounding box of the axis by looking at label
// widths/heights and ticks, make room by diminishing the
// plotOffset
@@ -871,7 +924,7 @@
// determine axis margin
var samePosition = $.grep(all, function (a) {
- return a && a.options.position == pos && (a.labelHeight || a.labelWidth);
+ return a && a.options.position == pos && a.reserveSpace;
});
if ($.inArray(axis, samePosition) == samePosition.length - 1)
axismargin = 0; // outermost
@@ -881,7 +934,7 @@
tickLength = "full";
var sameDirection = $.grep(all, function (a) {
- return a && (a.labelHeight || a.labelWidth);
+ return a && a.reserveSpace;
});
var innermost = $.inArray(axis, sameDirection) == 0;
@@ -924,7 +977,7 @@
axis.innermost = innermost;
}
- function fixupAxisBox(axis) {
+ function allocateAxisBoxSecondPhase(axis) {
// set remaining bounding box coordinates
if (axis.direction == "x") {
axis.box.left = plotOffset.left;
@@ -937,59 +990,67 @@
}
function setupGrid() {
- var axes = getUsedAxes(), j, k;
+ var i, axes = allAxes();
- // compute axis intervals
- for (k = 0; k < axes.length; ++k)
- setRange(axes[k]);
+ // first calculate the plot and axis box dimensions
+
+ $.each(axes, function (_, axis) {
+ axis.show = axis.options.show;
+ if (axis.show == null)
+ axis.show = axis.used; // by default an axis is visible if it's got data
+
+ axis.reserveSpace = axis.show || axis.options.reserveSpace;
+
+ setRange(axis);
+ });
+
+ allocatedAxes = $.grep(axes, function (axis) { return axis.reserveSpace; });
-
plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0;
if (options.grid.show) {
- // make the ticks
- for (k = 0; k < axes.length; ++k) {
- setupTickGeneration(axes[k]);
- setTicks(axes[k]);
- snapRangeToTicks(axes[k], axes[k].ticks);
- }
-
- // find labelWidth/Height, do this on all, not just
- // used as we might need to reserve space for unused
- // too if their labelWidth/Height is set
- for (j = 0; j < xaxes.length; ++j)
- measureTickLabels(xaxes[j]);
- for (j = 0; j < yaxes.length; ++j)
- measureTickLabels(yaxes[j]);
-
- // compute the axis boxes, start from the outside (reverse order)
- for (j = xaxes.length - 1; j >= 0; --j)
- computeAxisBox(xaxes[j]);
- for (j = yaxes.length - 1; j >= 0; --j)
- computeAxisBox(yaxes[j]);
+ $.each(allocatedAxes, function (_, axis) {
+ // make the ticks
+ setupTickGeneration(axis);
+ setTicks(axis);
+ snapRangeToTicks(axis, axis.ticks);
+
+ // find labelWidth/Height for axis
+ measureTickLabels(axis);
+ });
+
+ // with all dimensions in house, we can compute the
+ // axis boxes, start from the outside (reverse order)
+ for (i = allocatedAxes.length - 1; i >= 0; --i)
+ allocateAxisBoxFirstPhase(allocatedAxes[i]);
// make sure we've got enough space for things that
// might stick out
- var maxOutset = 0;
- for (var i = 0; i < series.length; ++i)
- maxOutset = Math.max(maxOutset, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
-
+ var minMargin = options.grid.minBorderMargin;
+ if (minMargin == null) {
+ minMargin = 0;
+ for (i = 0; i < series.length; ++i)
+ minMargin = Math.max(minMargin, series[i].points.radius + series[i].points.lineWidth/2);
+ }
+
for (var a in plotOffset) {
plotOffset[a] += options.grid.borderWidth;
- plotOffset[a] = Math.max(maxOutset, plotOffset[a]);
+ plotOffset[a] = Math.max(minMargin, plotOffset[a]);
}
}
plotWidth = canvasWidth - plotOffset.left - plotOffset.right;
plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top;
-
+
// now we got the proper plotWidth/Height, we can compute the scaling
- for (k = 0; k < axes.length; ++k)
- setTransformationHelpers(axes[k]);
+ $.each(axes, function (_, axis) {
+ setTransformationHelpers(axis);
+ });
if (options.grid.show) {
- for (k = 0; k < axes.length; ++k)
- fixupAxisBox(axes[k]);
-
+ $.each(allocatedAxes, function (_, axis) {
+ allocateAxisBoxSecondPhase(axis);
+ });
+
insertAxisLabels();
}
@@ -1008,7 +1069,7 @@
if (opts.min == null)
min -= widen;
- // alway widen max if we couldn't widen min to ensure we
+ // always widen max if we couldn't widen min to ensure we
// don't fall into min == max which doesn't work
if (opts.max == null || opts.min != null)
max += widen;
@@ -1042,12 +1103,10 @@
var noTicks;
if (typeof opts.ticks == "number" && opts.ticks > 0)
noTicks = opts.ticks;
- else if (axis.direction == "x")
- // heuristic based on the model a*sqrt(x) fitted to
- // some reasonable data points
- noTicks = 0.3 * Math.sqrt(canvasWidth);
else
- noTicks = 0.3 * Math.sqrt(canvasHeight);
+ // heuristic based on the model a*sqrt(x) fitted to
+ // some data points that seemed reasonable
+ noTicks = 0.3 * Math.sqrt(axis.direction == "x" ? canvasWidth : canvasHeight);
var delta = (axis.max - axis.min) / noTicks,
size, generator, unit, formatter, i, magn, norm;
@@ -1310,9 +1369,7 @@
}
function setTicks(axis) {
- axis.ticks = [];
-
- var oticks = axis.options.ticks, ticks = null;
+ var oticks = axis.options.ticks, ticks = [];
if (oticks == null || (typeof oticks == "number" && oticks > 0))
ticks = axis.tickGenerator(axis);
else if (oticks) {
@@ -1325,24 +1382,26 @@
// clean up/labelify the supplied ticks, copy them over
var i, v;
+ axis.ticks = [];
for (i = 0; i < ticks.length; ++i) {
var label = null;
var t = ticks[i];
if (typeof t == "object") {
- v = t[0];
+ v = +t[0];
if (t.length > 1)
label = t[1];
}
else
- v = t;
+ v = +t;
if (label == null)
label = axis.tickFormatter(v, axis);
- axis.ticks[i] = { v: v, label: label };
+ if (!isNaN(v))
+ axis.ticks.push({ v: v, label: label });
}
}
function snapRangeToTicks(axis, ticks) {
- if (axis.options.autoscaleMargin != null && ticks.length > 0) {
+ if (axis.options.autoscaleMargin && ticks.length > 0) {
// snap to ticks
if (axis.options.min == null)
axis.min = Math.min(axis.min, ticks[0].v);
@@ -1355,6 +1414,10 @@
ctx.clearRect(0, 0, canvasWidth, canvasHeight);
var grid = options.grid;
+
+ // draw background, if any
+ if (grid.show && grid.backgroundColor)
+ drawBackground();
if (grid.show && !grid.aboveData)
drawGrid();
@@ -1371,9 +1434,8 @@
}
function extractRange(ranges, coord) {
- var axis, from, to, axes, key;
+ var axis, from, to, key, axes = allAxes();
- axes = getUsedAxes();
for (i = 0; i < axes.length; ++i) {
axis = axes[i];
if (axis.direction == coord) {
@@ -1405,18 +1467,21 @@
return { from: from, to: to, axis: axis };
}
+ function drawBackground() {
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+
+ ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
+ ctx.fillRect(0, 0, plotWidth, plotHeight);
+ ctx.restore();
+ }
+
function drawGrid() {
var i;
ctx.save();
ctx.translate(plotOffset.left, plotOffset.top);
- // draw background, if any
- if (options.grid.backgroundColor) {
- ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
- ctx.fillRect(0, 0, plotWidth, plotHeight);
- }
-
// draw markings
var markings = options.grid.markings;
if (markings) {
@@ -1486,15 +1551,17 @@
}
// draw the ticks
- var axes = getUsedAxes(), bw = options.grid.borderWidth;
+ var axes = allAxes(), bw = options.grid.borderWidth;
for (var j = 0; j < axes.length; ++j) {
var axis = axes[j], box = axis.box,
t = axis.tickLength, x, y, xoff, yoff;
-
+ if (!axis.show || axis.ticks.length == 0)
+ continue
+
ctx.strokeStyle = axis.options.tickColor || $.color.parse(axis.options.color).scale('a', 0.22).toString();
ctx.lineWidth = 1;
-
+
// find the edges
if (axis.direction == "x") {
x = 0;
@@ -1588,9 +1655,11 @@
var html = ['<div class="tickLabels" style="font-size:smaller">'];
- var axes = getUsedAxes();
+ var axes = allAxes();
for (var j = 0; j < axes.length; ++j) {
var axis = axes[j], box = axis.box;
+ if (!axis.show)
+ continue;
//debug: html.push('<div style="position:absolute;opacity:0.10;background-color:red;left:' + box.left + 'px;top:' + box.top + 'px;width:' + box.width + 'px;height:' + box.height + 'px"></div>')
html.push('<div class="' + axis.direction + 'Axis ' + axis.direction + axis.n + 'Axis" style="color:' + axis.options.color + '">');
for (var i = 0; i < axis.ticks.length; ++i) {
@@ -2198,6 +2267,13 @@
maxx = maxDistance / axisx.scale,
maxy = maxDistance / axisy.scale;
+ // with inverse transforms, we can't use the maxx/maxy
+ // optimization, sadly
+ if (axisx.options.inverseTransform)
+ maxx = Number.MAX_VALUE;
+ if (axisy.options.inverseTransform)
+ maxy = Number.MAX_VALUE;
+
if (s.lines.show || s.points.show) {
for (j = 0; j < points.length; j += ps) {
var x = points[j], y = points[j + 1];
@@ -2264,7 +2340,13 @@
triggerClickHoverEvent("plothover", e,
function (s) { return s["hoverable"] != false; });
}
-
+
+ function onMouseLeave(e) {
+ if (options.grid.hoverable)
+ triggerClickHoverEvent("plothover", e,
+ function (s) { return false; });
+ }
+
function onClick(e) {
triggerClickHoverEvent("plotclick", e,
function (s) { return s["clickable"] != false; });
@@ -2294,7 +2376,9 @@
for (var i = 0; i < highlights.length; ++i) {
var h = highlights[i];
if (h.auto == eventname &&
- !(item && h.series == item.series && h.point == item.datapoint))
+ !(item && h.series == item.series &&
+ h.point[0] == item.datapoint[0] &&
+ h.point[1] == item.datapoint[1]))
unhighlight(h.series, h.point);
}
@@ -2447,6 +2531,8 @@
return plot;
};
+ $.plot.version = "0.7pre";
+
$.plot.plugins = [];
// returns a string with the date d formatted according to fmt
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js Fri Mar 18 13:37:29 2011
@@ -17,12 +17,13 @@ Options:
pan: {
interactive: false
+ cursor: "move" // CSS mouse cursor value used when dragging, e.g. "pointer"
frameRate: 20
}
xaxis, yaxis, x2axis, y2axis: {
- zoomRange: null // or [number, number] (min range, max range)
- panRange: null // or [number, number] (min, max)
+ zoomRange: null // or [number, number] (min range, max range) or false
+ panRange: null // or [number, number] (min, max) or false
}
"interactive" enables the built-in drag/click behaviour. If you enable
@@ -32,6 +33,9 @@ moving around; the same for zoom.
"amount" specifies the default amount to zoom in (so 1.5 = 150%)
relative to the current viewport.
+"cursor" is a standard CSS mouse cursor string used for visual
+feedback to the user when dragging.
+
"frameRate" specifies the maximum number of times per second the plot
will update itself while the user is panning around on it (set to null
to disable intermediate pans, the plot will then not update until the
@@ -40,11 +44,13 @@ mouse button is released).
"zoomRange" is the interval in which zooming can happen, e.g. with
zoomRange: [1, 100] the zoom will never scale the axis so that the
difference between min and max is smaller than 1 or larger than 100.
-You can set either end to null to ignore, e.g. [1, null].
+You can set either end to null to ignore, e.g. [1, null]. If you set
+zoomRange to false, zooming on that axis will be disabled.
"panRange" confines the panning to stay within a range, e.g. with
panRange: [-10, 20] panning stops at -10 in one end and at 20 in the
-other. Either can be null, e.g. [-10, null].
+other. Either can be null, e.g. [-10, null]. If you set
+panRange to false, panning on that axis will be disabled.
Example API usage:
@@ -114,66 +120,78 @@ Licensed under the MIT License ~ http://
},
pan: {
interactive: false,
+ cursor: "move",
frameRate: 20
}
};
function init(plot) {
+ function onZoomClick(e, zoomOut) {
+ var c = plot.offset();
+ c.left = e.pageX - c.left;
+ c.top = e.pageY - c.top;
+ if (zoomOut)
+ plot.zoomOut({ center: c });
+ else
+ plot.zoom({ center: c });
+ }
+
+ function onMouseWheel(e, delta) {
+ onZoomClick(e, delta < 0);
+ return false;
+ }
+
+ var prevCursor = 'default', prevPageX = 0, prevPageY = 0,
+ panTimeout = null;
+
+ function onDragStart(e) {
+ if (e.which != 1) // only accept left-click
+ return false;
+ var c = plot.getPlaceholder().css('cursor');
+ if (c)
+ prevCursor = c;
+ plot.getPlaceholder().css('cursor', plot.getOptions().pan.cursor);
+ prevPageX = e.pageX;
+ prevPageY = e.pageY;
+ }
+
+ function onDrag(e) {
+ var frameRate = plot.getOptions().pan.frameRate;
+ if (panTimeout || !frameRate)
+ return;
+
+ panTimeout = setTimeout(function () {
+ plot.pan({ left: prevPageX - e.pageX,
+ top: prevPageY - e.pageY });
+ prevPageX = e.pageX;
+ prevPageY = e.pageY;
+
+ panTimeout = null;
+ }, 1 / frameRate * 1000);
+ }
+
+ function onDragEnd(e) {
+ if (panTimeout) {
+ clearTimeout(panTimeout);
+ panTimeout = null;
+ }
+
+ plot.getPlaceholder().css('cursor', prevCursor);
+ plot.pan({ left: prevPageX - e.pageX,
+ top: prevPageY - e.pageY });
+ }
+
function bindEvents(plot, eventHolder) {
var o = plot.getOptions();
if (o.zoom.interactive) {
- function clickHandler(e, zoomOut) {
- var c = plot.offset();
- c.left = e.pageX - c.left;
- c.top = e.pageY - c.top;
- if (zoomOut)
- plot.zoomOut({ center: c });
- else
- plot.zoom({ center: c });
- }
-
- eventHolder[o.zoom.trigger](clickHandler);
-
- eventHolder.mousewheel(function (e, delta) {
- clickHandler(e, delta < 0);
- return false;
- });
+ eventHolder[o.zoom.trigger](onZoomClick);
+ eventHolder.mousewheel(onMouseWheel);
}
+
if (o.pan.interactive) {
- var prevCursor = 'default', pageX = 0, pageY = 0,
- panTimeout = null;
-
- eventHolder.bind("dragstart", { distance: 10 }, function (e) {
- if (e.which != 1) // only accept left-click
- return false;
- eventHolderCursor = eventHolder.css('cursor');
- eventHolder.css('cursor', 'move');
- pageX = e.pageX;
- pageY = e.pageY;
- });
- eventHolder.bind("drag", function (e) {
- if (panTimeout || !o.pan.frameRate)
- return;
-
- panTimeout = setTimeout(function () {
- plot.pan({ left: pageX - e.pageX,
- top: pageY - e.pageY });
- pageX = e.pageX;
- pageY = e.pageY;
-
- panTimeout = null;
- }, 1/o.pan.frameRate * 1000);
- });
- eventHolder.bind("dragend", function (e) {
- if (panTimeout) {
- clearTimeout(panTimeout);
- panTimeout = null;
- }
-
- eventHolder.css('cursor', prevCursor);
- plot.pan({ left: pageX - e.pageX,
- top: pageY - e.pageY });
- });
+ eventHolder.bind("dragstart", { distance: 10 }, onDragStart);
+ eventHolder.bind("drag", onDrag);
+ eventHolder.bind("dragend", onDragEnd);
}
}
@@ -212,10 +230,14 @@ Licensed under the MIT License ~ http://
}
};
- $.each(plot.getUsedAxes(), function(i, axis) {
+ $.each(plot.getAxes(), function(_, axis) {
var opts = axis.options,
min = minmax[axis.direction].min,
- max = minmax[axis.direction].max
+ max = minmax[axis.direction].max,
+ zr = opts.zoomRange;
+
+ if (zr === false) // no zooming on this axis
+ return;
min = axis.c2p(min);
max = axis.c2p(max);
@@ -226,7 +248,7 @@ Licensed under the MIT License ~ http://
max = tmp;
}
- var range = max - min, zr = opts.zoomRange;
+ var range = max - min;
if (zr &&
((zr[0] != null && range < zr[0]) ||
(zr[1] != null && range > zr[1])))
@@ -254,7 +276,7 @@ Licensed under the MIT License ~ http://
if (isNaN(delta.y))
delta.y = 0;
- $.each(plot.getUsedAxes(), function (i, axis) {
+ $.each(plot.getAxes(), function (_, axis) {
var opts = axis.options,
min, max, d = delta[axis.direction];
@@ -262,6 +284,9 @@ Licensed under the MIT License ~ http://
max = axis.c2p(axis.p2c(axis.max) + d);
var pr = opts.panRange;
+ if (pr === false) // no panning on this axis
+ return;
+
if (pr) {
// check whether we hit the wall
if (pr[0] != null && pr[0] > min) {
@@ -287,14 +312,25 @@ Licensed under the MIT License ~ http://
if (!args.preventEvent)
plot.getPlaceholder().trigger("plotpan", [ plot ]);
}
+
+ function shutdown(plot, eventHolder) {
+ eventHolder.unbind(plot.getOptions().zoom.trigger, onZoomClick);
+ eventHolder.unbind("mousewheel", onMouseWheel);
+ eventHolder.unbind("dragstart", onDragStart);
+ eventHolder.unbind("drag", onDrag);
+ eventHolder.unbind("dragend", onDragEnd);
+ if (panTimeout)
+ clearTimeout(panTimeout);
+ }
plot.hooks.bindEvents.push(bindEvents);
+ plot.hooks.shutdown.push(shutdown);
}
$.plot.plugins.push({
init: init,
options: options,
name: 'navigate',
- version: '1.2'
+ version: '1.3'
});
})(jQuery);
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js Fri Mar 18 13:37:29 2011
@@ -403,7 +403,7 @@ More detail and specific examples can be
}
ctx.beginPath();
- if (angle!=Math.PI*2)
+ if (Math.abs(angle - Math.PI*2) > 0.000000001)
ctx.moveTo(0,0); // Center of the pie
else if ($.browser.msie)
angle -= 0.0001;
@@ -607,12 +607,9 @@ More detail and specific examples can be
}
}
- // if no slice was found, quit
- if (!item)
- return;
-
// highlight the slice
- highlight(item.series, eventname);
+ if (item)
+ highlight(item.series, eventname);
// trigger any hover bind events
var pos = { pageX: e.pageX, pageY: e.pageY };
@@ -691,7 +688,7 @@ More detail and specific examples can be
octx.fillStyle = "rgba(255, 255, 255, "+options.series.pie.highlight.opacity+")"; // this is temporary until we have access to parseColor
octx.beginPath();
- if (series.angle!=Math.PI*2)
+ if (Math.abs(series.angle - Math.PI*2) > 0.000000001)
octx.moveTo(0,0); // Center of the pie
octx.arc(0,0,radius,series.startAngle,series.startAngle+series.angle,false);
octx.closePath();
@@ -750,4 +747,4 @@ More detail and specific examples can be
name: "pie",
version: "1.0"
});
-})(jQuery);
\ No newline at end of file
+})(jQuery);
Added: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js?rev=1082916&view=auto
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js (added)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js Fri Mar 18 13:37:29 2011
@@ -0,0 +1,60 @@
+/*
+Flot plugin for automatically redrawing plots when the placeholder
+size changes, e.g. on window resizes.
+
+It works by listening for changes on the placeholder div (through the
+jQuery resize event plugin) - if the size changes, it will redraw the
+plot.
+
+There are no options. If you need to disable the plugin for some
+plots, you can just fix the size of their placeholders.
+*/
+
+
+/* Inline dependency:
+ * jQuery resize event - v1.1 - 3/14/2010
+ * http://benalman.com/projects/jquery-resize-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if($.isFunction(l)){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this);
+
+
+(function ($) {
+ var options = { }; // no options
+
+ function init(plot) {
+ function onResize() {
+ var placeholder = plot.getPlaceholder();
+
+ // somebody might have hidden us and we can't plot
+ // when we don't have the dimensions
+ if (placeholder.width() == 0 || placeholder.height() == 0)
+ return;
+
+ plot.resize();
+ plot.setupGrid();
+ plot.draw();
+ }
+
+ function bindEvents(plot, eventHolder) {
+ plot.getPlaceholder().resize(onResize);
+ }
+
+ function shutdown(plot, eventHolder) {
+ plot.getPlaceholder().unbind("resize", onResize);
+ }
+
+ plot.hooks.bindEvents.push(bindEvents);
+ plot.hooks.shutdown.push(shutdown);
+ }
+
+ $.plot.plugins.push({
+ init: init,
+ options: options,
+ name: 'resize',
+ version: '1.0'
+ });
+})(jQuery);
Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js Fri Mar 18 13:37:29 2011
@@ -11,7 +11,9 @@ The plugin defines the following options
Selection support is enabled by setting the mode to one of "x", "y" or
"xy". In "x" mode, the user will only be able to specify the x range,
similarly for "y" mode. For "xy", the selection becomes a rectangle
-where both ranges can be specified. "color" is color of the selection.
+where both ranges can be specified. "color" is color of the selection
+(if you need to change the color later on, you can get to it with
+plot.getOptions().selection.color).
When selection support is enabled, a "plotselected" event will be
emitted on the DOM element you passed into the plot function. The
@@ -79,11 +81,13 @@ The plugin allso adds the following meth
// make this plugin much slimmer.
var savedhandlers = {};
+ var mouseUpHandler = null;
+
function onMouseMove(e) {
if (selection.active) {
- plot.getPlaceholder().trigger("plotselecting", [ getSelection() ]);
-
updateSelection(e);
+
+ plot.getPlaceholder().trigger("plotselecting", [ getSelection() ]);
}
}
@@ -107,18 +111,24 @@ The plugin allso adds the following meth
setSelectionPos(selection.first, e);
selection.active = true;
+
+ // this is a bit silly, but we have to use a closure to be
+ // able to whack the same handler again
+ mouseUpHandler = function (e) { onMouseUp(e); };
- $(document).one("mouseup", onMouseUp);
+ $(document).one("mouseup", mouseUpHandler);
}
function onMouseUp(e) {
+ mouseUpHandler = null;
+
// revert drag stuff for old-school browsers
if (document.onselectstart !== undefined)
document.onselectstart = savedhandlers.onselectstart;
if (document.ondrag !== undefined)
document.ondrag = savedhandlers.ondrag;
- // no more draggy-dee-drag
+ // no more dragging
selection.active = false;
updateSelection(e);
@@ -197,13 +207,12 @@ The plugin allso adds the following meth
}
}
- // taken from markings support
+ // function taken from markings support in Flot
function extractRange(ranges, coord) {
- var axis, from, to, axes, key;
+ var axis, from, to, key, axes = plot.getAxes();
- axes = plot.getUsedAxes();
- for (i = 0; i < axes.length; ++i) {
- axis = axes[i];
+ for (var k in axes) {
+ axis = axes[k];
if (axis.direction == coord) {
key = coord + axis.n + "axis";
if (!ranges[key] && axis.n == 1)
@@ -233,7 +242,6 @@ The plugin allso adds the following meth
return { from: from, to: to, axis: axis };
}
-
function setSelection(ranges, preventEvent) {
var axis, range, o = plot.getOptions();
@@ -277,11 +285,10 @@ The plugin allso adds the following meth
plot.hooks.bindEvents.push(function(plot, eventHolder) {
var o = plot.getOptions();
- if (o.selection.mode != null)
+ if (o.selection.mode != null) {
eventHolder.mousemove(onMouseMove);
-
- if (o.selection.mode != null)
eventHolder.mousedown(onMouseDown);
+ }
});
@@ -312,6 +319,15 @@ The plugin allso adds the following meth
ctx.restore();
}
});
+
+ plot.hooks.shutdown.push(function (plot, eventHolder) {
+ eventHolder.unbind("mousemove", onMouseMove);
+ eventHolder.unbind("mousedown", onMouseDown);
+
+ if (mouseUpHandler)
+ $(document).unbind("mouseup", mouseUpHandler);
+ });
+
}
$.plot.plugins.push({
@@ -323,6 +339,6 @@ The plugin allso adds the following meth
}
},
name: 'selection',
- version: '1.0'
+ version: '1.1'
});
})(jQuery);