From cc6c0dbfc425476aca2ff0f86cfc21b6ae255d70 Mon Sep 17 00:00:00 2001 From: mojoaxel Date: Sun, 22 Feb 2015 22:32:23 +0100 Subject: [PATCH] created better class struktures for readability --- GPL-LICENSE.txt | 278 ------------------------------------- MIT-LICENSE.txt | 20 --- README.md | 2 +- bower.json | 7 +- dist/jquery.flot.events.js | 240 ++++++++++++++++++-------------- 5 files changed, 142 insertions(+), 405 deletions(-) delete mode 100644 GPL-LICENSE.txt delete mode 100644 MIT-LICENSE.txt diff --git a/GPL-LICENSE.txt b/GPL-LICENSE.txt deleted file mode 100644 index 11dddd0..0000000 --- a/GPL-LICENSE.txt +++ /dev/null @@ -1,278 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt deleted file mode 100644 index 5a7d654..0000000 --- a/MIT-LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2011 Joel Oughton, http://joeloughton.com/ - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index ec89ed6..c63f225 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ Flot Charting Library Plugin to show Events-Markers This plugin is based on [Joel Oughton](https://github.com/oughton)s ["Event Graphics" plugin](http://joeloughton.com/blog/web-applications/flot-plugins-event-graphics/) from the [https://github.com/oughton/flot-plugin-collection](flot-plugin-collection). -*Dual licensed under GPLv2 and MIT* \ No newline at end of file +* Dual licensed under MIT and GPL-2.0+ \ No newline at end of file diff --git a/bower.json b/bower.json index dcd0628..eb762da 100644 --- a/bower.json +++ b/bower.json @@ -3,8 +3,8 @@ "version": "0.1.0", "homepage": "https://github.com/mojoaxel/flot-events", "authors": [ - "Joel Oughton ", "Alexander Wunschik " + "Joel Oughton ", ], "description": "Plugin for the flot charting library to show event-markers", "main": "dist/jquery.flot.events.js", @@ -13,7 +13,10 @@ ], "keywords": [ "flot", - "markers" + "plugin", + "events", + "markers", + "markings" ], "license": [ "MIT", diff --git a/dist/jquery.flot.events.js b/dist/jquery.flot.events.js index 2c23e1b..71d9199 100644 --- a/dist/jquery.flot.events.js +++ b/dist/jquery.flot.events.js @@ -92,72 +92,46 @@ /** * @class TODO */ - var Marker = function() { - - }; - - - function init(plot){ - var _events = [], - _types, + var Marker = function(plot) { + var _events = [], _eventsEnabled = false, - lastRange; + _lastRange; - plot.getEvents = function(){ + this._types = []; + this.plot = plot; + + this.getEvents = function() { return _events; }; - plot.hideEvents = function(){ - $.each(_events, function(index, event){ - event.visual().getObject().hide(); - }); - }; + this.setTypes = function(types) { + return this._types = types; + } - plot.showEvents = function(){ - plot.hideEvents(); - $.each(_events, function(index, event){ - event.hide(); - }); - - _drawEvents(); - }; + this.setLastRage = function(lastRange) { + return this._lastRange = lastRange; + } - plot.hooks.processOptions.push(function(plot, options){ - // enable the plugin - if (options.events.data != null) { - _eventsEnabled = true; - } - }); + this.getEventsEnabled = function() { + return _eventsEnabled; + }; - plot.hooks.draw.push(function(plot, canvascontext){ - var options = plot.getOptions(); - var xaxis = plot.getXAxes()[options.events.xaxis - 1]; - - if (_eventsEnabled) { - // check for first run - if (_events.length < 1) { - _lastRange = xaxis.max - xaxis.min; - _types = options.events.types; - _setupEvents(options.events.data); - } else { - _updateEvents(); - } - } - - _drawEvents(); - }); + this.setEventsEnabled = function(state) { + return _eventsEnabled = state; + } /** * TODO */ - var _drawEvents = function() { - var o = plot.getPlotOffset(); - var pleft = o.left, pright = plot.width() - o.right; + this.drawEvents = function() { + var that = this; + var o = this.plot.getPlotOffset(); + var pleft = o.left, pright = this.plot.width() - o.right; $.each(_events, function(index, event){ // check event is inside the graph range - if (_insidePlot(event.getOptions().min) && + if (that._insidePlot(event.getOptions().min) && !event.isHidden()) { event.visual().draw(); } else { @@ -165,37 +139,56 @@ } }); }; - + /** * TODO */ - var _clearEvents = function(){ - $.each(_events, function(index, val) { - val.visual().clear(); + this.updateEvents = function() { + var that = this; + var o = this.plot.getPlotOffset(), left, top; + var xaxis = this.plot.getXAxes()[this.plot.getOptions().events.xaxis - 1]; + + $.each(_events, function(index, event) { + top = o.top + that.plot.height() - event.visual().height(); + left = xaxis.p2c(event.getOptions().min) + o.left - event.visual().width() / 2; + + event.visual().moveTo({ top: top, left: left }); }); + }; - _events = []; + /** + * TODO + */ + this.setupEvents = function(events){ + var that = this; + $.each(events, function(index, event){ + var ve = new VisualEvent(event, that._buildDiv(event)); + _events.push(ve); + }); + + _events.sort(function(a, b) { + var ao = a.getOptions(), bo = b.getOptions(); + if (ao.min > bo.min) return 1; + if (ao.min < bo.min) return -1; + return 0; + }); }; /** * TODO */ - var _updateEvents = function() { - var o = plot.getPlotOffset(), left, top; - var xaxis = plot.getXAxes()[plot.getOptions().events.xaxis - 1]; - - $.each(_events, function(index, event) { - top = o.top + plot.height() - event.visual().height(); - left = xaxis.p2c(event.getOptions().min) + o.left - event.visual().width() / 2; - - event.visual().moveTo({ top: top, left: left }); + this._clearEvents = function(){ + $.each(_events, function(index, val) { + val.visual().clear(); }); + + _events = []; }; /** * TODO */ - var _showTooltip = function(x, y, event){ + this._showTooltip = function(x, y, event){ x = Math.round(x); y = Math.round(y); @@ -230,26 +223,11 @@ /** * TODO */ - var _setupEvents = function(events){ - $.each(events, function(index, event){ - _events.push(new VisualEvent(event, _buildDiv(event))); - }); - - _events.sort(function(a, b) { - var ao = a.getOptions(), bo = b.getOptions(); - if (ao.min > bo.min) return 1; - if (ao.min < bo.min) return -1; - return 0; - }); - }; - - /** - * TODO - */ - var _buildDiv = function(event){ + this._buildDiv = function(event){ + var that = this; //var po = plot.pointOffset({ x: 450, y: 1}); - var container = plot.getPlaceholder(), o = plot.getPlotOffset(), yaxis, - xaxis = plot.getXAxes()[plot.getOptions().events.xaxis - 1], axes = plot.getAxes(); + var container = this.plot.getPlaceholder(), o = this.plot.getPlotOffset(), yaxis, + xaxis = this.plot.getXAxes()[this.plot.getOptions().events.xaxis - 1], axes = this.plot.getAxes(); var top, left, @@ -265,33 +243,33 @@ // map the eventType to a types object var eventTypeId = -1; - $.each(_types, function(index, type){ + $.each(this._types, function(index, type){ if (type.eventType == event.eventType) { eventTypeId = index; return false; } }); - if (_types == null || !_types[eventTypeId] || !_types[eventTypeId].color) { + if (this._types == null || !this._types[eventTypeId] || !this._types[eventTypeId].color) { color = '#666'; } else { - color = _types[eventTypeId].color; + color = this._types[eventTypeId].color; } - if (_types == null || !_types[eventTypeId] || !_types[eventTypeId].markerSize) { + if (this._types == null || !this._types[eventTypeId] || !this._types[eventTypeId].markerSize) { markerSize = 5; //default marker size } else { - markerSize = _types[eventTypeId].markerSize; + markerSize = this._types[eventTypeId].markerSize; } - if (_types == null || !_types[eventTypeId] || !_types[eventTypeId].lineStyle) { + if (this._types == null || !this._types[eventTypeId] || !this._types[eventTypeId].lineStyle) { lineStyle = 'dashed'; //default line style } else { - lineStyle = _types[eventTypeId].lineStyle.toLowerCase(); + lineStyle = this._types[eventTypeId].lineStyle.toLowerCase(); } - top = o.top + plot.height(); + top = o.top + this.plot.height(); left = xaxis.p2c(event.min) + o.left; line = $('
').css({ @@ -300,7 +278,7 @@ "left": left + 'px', "top": 8, "width": "1px", - "height": plot.height(), + "height": this.plot.height(), "border-left-width": "1px", "border-left-style": lineStyle, "border-left-color": color @@ -321,7 +299,7 @@ }) .appendTo(line); - if (_types[eventTypeId] && _types[eventTypeId].position && _types[eventTypeId].position.toUpperCase() === 'BOTTOM') { + if (this._types[eventTypeId] && this._types[eventTypeId].position && this._types[eventTypeId].position.toUpperCase() === 'BOTTOM') { marker.css({ "top": top-markerSize-8 +"px", "border-top": "none", @@ -343,14 +321,16 @@ // mouseenter function(){ var pos = $(this).offset(); - if (_types[eventTypeId] && _types[eventTypeId].position && _types[eventTypeId].position.toUpperCase() === 'BOTTOM') { + if (that._types[eventTypeId] && + that._types[eventTypeId].position && + that._types[eventTypeId].position.toUpperCase() === 'BOTTOM') { pos.top -= 150; } - _showTooltip(pos.left, pos.top, $(this).data("event")); + that._showTooltip(pos.left, pos.top, $(this).data("event")); if (event.min != event.max) { - plot.setSelection({ + that.plot.setSelection({ xaxis: { from: event.min, to: event.max @@ -366,12 +346,12 @@ function(){ //$(this).data("bouncing", false); $('#tooltip').remove(); - plot.clearSelection(); + that.plot.clearSelection(); }); drawableEvent = new DrawableEvent( line, - function(obj) { obj.show(); }, + function drawFunc(obj) { obj.show(); }, function(obj){ obj.remove(); }, function(obj, position){ obj.css({ @@ -412,15 +392,67 @@ /** * TODO */ - var _insidePlot = function(x) { - var xaxis = plot.getXAxes()[plot.getOptions().events.xaxis - 1]; + this._insidePlot = function(x) { + var xaxis = this.plot.getXAxes()[this.plot.getOptions().events.xaxis - 1]; var xc = xaxis.p2c(x); return xc > 0 && xc < xaxis.p2c(xaxis.max); }; + }; + + + function init(plot){ + var that = this; + var marker = new Marker(plot); + + /* + plot.getEvents = function(){ + return marker._events; + }; + + plot.hideEvents = function(){ + $.each(marker._events, function(index, event){ + event.visual().getObject().hide(); + }); + }; + + plot.showEvents = function(){ + plot.hideEvents(); + $.each(marker._events, function(index, event){ + event.hide(); + }); + + that.marker.drawEvents(); + }; + */ + + plot.hooks.processOptions.push(function(plot, options){ + // enable the plugin + if (options.events.data != null) { + marker.setEventsEnabled(true); + } + }); + + plot.hooks.draw.push(function(plot, canvascontext){ + var options = plot.getOptions(); + var xaxis = plot.getXAxes()[options.events.xaxis - 1]; + + if (marker.getEventsEnabled) { + // check for first run + if (marker.getEvents().length < 1) { + marker.setLastRage(xaxis.max - xaxis.min); + marker.setTypes(options.events.types); + marker.setupEvents(options.events.data); + } else { + marker.updateEvents(); + } + } + + marker.drawEvents(); + }); }//init - var options = { + var defaultOptions = { events: { data: null, types: null, @@ -431,8 +463,8 @@ $.plot.plugins.push({ init: init, - options: options, + options: defaultOptions, name: "events", - version: "0.20" + version: "0.1.0" }); })(jQuery);