rgraph-rails 1.0.4 → 1.0.5

data/vendor/assets/javascripts/RGraph.common.effects.js

@@ -1,4 +1,4 @@
-// version: 2016-02-06
+// version: 2016-06-04
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -7,7 +7,7 @@
     * |                                                                                |
     * | RGraph is dual licensed under the Open Source GPL (General Public License)     |
     * | v2.0 license and a commercial license which means that you're not bound by     |
-    * | the terms of the GPL. The commercial license starts at just �99 (GBP) and      |
+    * | the terms of the GPL. The commercial license starts at just 99 GBP and      |
     * | you can read about it here:                                                    |
     * |                                                                                |
     * |                      http://www.rgraph.net/license                             |
@@ -201,15 +201,15 @@
     {
         // This function gets added to the chart object - so the this
         // variable is the chart object
-        var obj      = this;
-        var opt      = arguments[0] || {};
-        var frames   = opt.frames || 30;
-        var frame    = 0;
-        var pc       = -20;
-        var step     = (120 - pc) / frames;
-        var canvasXY = RG.getCanvasXY(obj.canvas);
-        var color    = opt.color || 'white';
-        var callback = arguments[1] || function () {};
+        var obj      = this,
+            opt      = arguments[0] || {},
+            frames   = opt.frames || 30,
+            frame    = 0,
+            pc       = -20,
+            step     = (120 - pc) / frames,
+            canvasXY = RG.getCanvasXY(obj.canvas),
+            color    = opt.color || 'white',
+            callback = arguments[1] || function () {};
 
         
         // Draw the chart
@@ -230,8 +230,8 @@
             {
                 if (pc < 120) {
                     $('div#rgraph_fadeslide_cover_' + obj.id).css({
-                                                                   background: 'linear-gradient(135deg, rgba(255,255,255,0) ' + pc + '%, ' + color + ' ' + (pc + 20) + '%)'
-                                                                  });
+                        background: 'linear-gradient(135deg, rgba(255,255,255,0) ' + pc + '%, ' + color + ' ' + (pc + 20) + '%)'
+                    });
                     pc += step;
                     RG.Effects.updateCanvas(iterator);
                 
@@ -292,8 +292,8 @@
                     RG.Effects.updateCanvas(iterator);
                 
                 } else {
-                
-                    RG.clear(obj.canvas, color)
+
+                    RG.clear(obj.canvas, obj.get('clearto'))
                 
                     $('div#rgraph_fadeslide_cover_' + obj.id).remove();
 
@@ -411,9 +411,9 @@
                     RG.Effects.updateCanvas(iterator);
             
             } else {
-            
+
                 RG.clear(obj.canvas, color);
-            
+
                 $('div#rgraph_fadeslide_cover_' + obj.id).remove();
 
                 callback(obj);
@@ -525,7 +525,7 @@
             } else {
             
                 RG.clear(obj.canvas);
-            
+
                 $('div#rgraph_fadeslide_cover_' + obj.id).remove();
 
                 callback(obj);
@@ -638,22 +638,31 @@
         obj.canvas.style.top      = 0;
         obj.canvas.style.left     = 0;
 
-
-        jQuery('#' + obj.id).animate({
-            width: (obj.canvas.width * 1.2) + 'px',
-            height: (obj.canvas.height * 1.2) + 'px',
-            left: (obj.canvas.width * -0.1) + 'px',
-            top: (obj.canvas.height * -0.1) + 'px'
-        }, duration * 0.25, function ()
-        {
-                jQuery('#' + obj.id).animate({
-                    opacity: 0,
-                    width: 0,
-                    height: 0,
-                    left: (obj.canvas.width * 0.5) + 'px',
-                    top: (obj.canvas.height * 0.5) + 'px'
-                }, duration * 0.75, function () {callback(obj);});
-        });
+        if (opt.bounce !== false) {
+            jQuery('#' + obj.id).animate({
+                width: (obj.canvas.width * 1.2) + 'px',
+                height: (obj.canvas.height * 1.2) + 'px',
+                left: (obj.canvas.width * -0.1) + 'px',
+                top: (obj.canvas.height * -0.1) + 'px'
+            }, duration * 0.25, function ()
+            {
+                    jQuery('#' + obj.id).animate({
+                        opacity: 0,
+                        width: 0,
+                        height: 0,
+                        left: (obj.canvas.width * 0.5) + 'px',
+                        top: (obj.canvas.height * 0.5) + 'px'
+                    }, duration * 0.75, function () {callback(obj);});
+            });
+        } else {
+            jQuery('#' + obj.id).animate({
+                opacity: 0,
+                width: 0,
+                height: 0,
+                left: (obj.canvas.width * 0.5) + 'px',
+                top: (obj.canvas.height * 0.5) + 'px'
+            }, duration * 0.75, function () {callback(obj);});
+        }
         
         
         return this;
@@ -828,7 +837,6 @@
 
 
 
-
         var divs = [
             ['rgraph_conceal_left_' + obj.id, xy[0], xy[1], 0, obj.canvas.height],
             ['rgraph_conceal_right_' + obj.id,(xy[0] + obj.canvas.width),xy[1],0,obj.canvas.height],
@@ -866,7 +874,7 @@
             doc.body.removeChild(doc.getElementById("rgraph_conceal_left_" + obj.id));
             doc.body.removeChild(doc.getElementById("rgraph_conceal_right_" + obj.id));
             
-            RG.clear(obj.canvas, color);
+            RG.clear(obj.canvas);
             
             callback(obj);
         
@@ -1317,7 +1325,16 @@
             }
         }
         
-        setTimeout(function () {callback(obj);}, duration);
+        setTimeout(function ()
+        {
+            RGraph.clear(obj.canvas);
+            jQuery('#' + 'rgraph_hscissors_' + 0 + '_' + obj.id).remove();
+            jQuery('#' + 'rgraph_hscissors_' + 1 + '_' + obj.id).remove();
+            jQuery('#' + 'rgraph_hscissors_' + 2 + '_' + obj.id).remove();
+            jQuery('#' + 'rgraph_hscissors_' + 3 + '_' + obj.id).remove();
+            jQuery('#' + 'rgraph_hscissors_' + 4 + '_' + obj.id).remove();
+            callback(obj);
+        }, duration);
         
         return this;
     };
@@ -1445,7 +1462,14 @@
             }
         }
         
-        setTimeout(function () {callback(obj);}, duration);
+        setTimeout(function ()
+        {
+            RG.clear(obj.canvas);
+            for (var i=0; i<10; i++) {
+                jQuery('#rgraph_vscissors_' + i + '_' + obj.id).remove();
+            }
+            callback(obj);
+        }, duration);
         
         return this;
     };

data/vendor/assets/javascripts/RGraph.common.key.js

@@ -1,4 +1,4 @@
-// version: 2016-02-06
+// version: 2016-06-04
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -7,7 +7,7 @@
     * |                                                                                |
     * | RGraph is dual licensed under the Open Source GPL (General Public License)     |
     * | v2.0 license and a commercial license which means that you're not bound by     |
-    * | the terms of the GPL. The commercial license starts at just �99 (GBP) and      |
+    * | the terms of the GPL. The commercial license starts at just 99 GBP and      |
     * | you can read about it here:                                                    |
     * |                                                                                |
     * |                      http://www.rgraph.net/license                             |
@@ -298,15 +298,26 @@
                     co.beginPath();
                     co.fillStyle = typeof text_color == 'object' ? text_color[i] : text_color;
                 
-                    ret = RG.Text2(obj, {'font': text_font,
-                                         'size': text_size,
-                                         'bold': text_bold,
-                                         'italic': text_italic,
-                                         'x': hpos + blob_size + 5 + 5,
-                                         'y': vpos + (5 * j) + (text_size * j) + 3,
-                                         'text': key[i]});
-
-                    obj.coords.key[i] = [ret.x, ret.y, ret.width, ret.height, key[i], colors[i], obj];
+                    ret = RG.Text2(obj, {
+                        'font': text_font,
+                        'size': text_size,
+                        'bold': text_bold,
+                        'italic': text_italic,
+                        'x': hpos + blob_size + 5 + 5,
+                        'y': vpos + (5 * j) + (text_size * j) + 3,
+                        'text': key[i],
+                        'accessible': !obj.properties['chart.key.interactive']
+                    });
+
+                    obj.coords.key[i] = [
+                        ret.x,
+                        ret.y,
+                        ret.width,
+                        ret.height,
+                        key[i],
+                        colors[i],
+                        obj
+                    ];
                 }
             co.fill();
         }
@@ -537,12 +548,21 @@
                         'italic': text_italic,
                         'x':pos,
                         'y':vpos + text_size + 3,
-                        'text': key[i]
+                        'text': key[i],
+                        accessible: !obj.properties['chart.key.interactive']
                     });
                 co.fill();
                 pos += co.measureText(key[i]).width;
-                
-                obj.coords.key[i] = [ret.x, ret.y, ret.width, ret.height, key[i], colors[i], obj];
+            
+                obj.coords.key[i] = [
+                    ret.x,
+                    ret.y,
+                    ret.width,
+                    ret.height,
+                    key[i],
+                    colors[i],
+                    obj
+                ];
             }
         }
 
@@ -622,7 +642,7 @@
                     
                     rect.onmousemove = function (e, shape)
                     {
-                        e.target.style.cursor = 'pointer';
+                        return true;
                     }
                 })(i);
             }

data/vendor/assets/javascripts/RGraph.common.resizing.js

@@ -1,4 +1,4 @@
-// version: 2016-02-06
+// version: 2016-06-04
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -7,7 +7,7 @@
     * |                                                                                |
     * | RGraph is dual licensed under the Open Source GPL (General Public License)     |
     * | v2.0 license and a commercial license which means that you're not bound by     |
-    * | the terms of the GPL. The commercial license starts at just �99 (GBP) and      |
+    * | the terms of the GPL. The commercial license starts at just 99 GBP and      |
     * | you can read about it here:                                                    |
     * |                                                                                |
     * |                      http://www.rgraph.net/license                             |
@@ -33,9 +33,9 @@
     RGraph.allowResizing =
     RGraph.AllowResizing = function (obj)
     {
-        var ca = obj.canvas,
-            co = obj.context,
-            pa = RGraph.path;
+        var ca  = obj.canvas,
+            co  = obj.context,
+            pa2 = RG.path2;
         
         ca.resizing = ca.resizing || {};
         ca.resizing.placeHolders = ca.resizing.placeHolders || [];
@@ -80,31 +80,42 @@
 
 
         // Draw the resize handle
-        pa(co, ['b','m', ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX, ca.height - resizeHandleSize,'r', ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX, ca.height - resizeHandleSize + ca.resizing.adjustY, 2 * resizeHandleSize, resizeHandleSize,'f', ca.resizing.bgcolor]);
+        pa2(co,  
+            'b m % % r % % % % f %',
+            ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX, ca.height - resizeHandleSize,
+            ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX, ca.height - resizeHandleSize + ca.resizing.adjustY, 2 * resizeHandleSize, resizeHandleSize,
+            ca.resizing.bgcolor
+        );
 
         // Draw the arrows
-        pa(co, ['b','lw', 1,'m', ma.round(ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX), ca.height - resizeHandleSize + ca.resizing.adjustY,'l', ma.round(ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX), ca.height + ca.resizing.adjustY,'m',ca.width + ca.resizing.adjustX, ma.round(ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY),'l',  ca.width - resizeHandleSize + ca.resizing.adjustX, ma.round(ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY), 's', 'gray', 'f', 'transparent']);
+        pa2(co,
+            'b lw 1 m % % l % % m % % l % % s gray f transparent',
+            ma.round(ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX), ca.height - resizeHandleSize + ca.resizing.adjustY,
+            ma.round(ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX), ca.height + ca.resizing.adjustY,
+            ca.width + ca.resizing.adjustX, ma.round(ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY),
+            ca.width - resizeHandleSize + ca.resizing.adjustX, ma.round(ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY)
+        );
 
         // Top arrow head
-        pa(co, [ 'b', 'm', ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX, ca.height - resizeHandleSize + ca.resizing.adjustY, 'l',ca.width - (resizeHandleSize / 2) + 3 + ca.resizing.adjustX, ca.height - resizeHandleSize + 3 + ca.resizing.adjustY, 'l',ca.width - (resizeHandleSize / 2) - 3 + ca.resizing.adjustX, ca.height - resizeHandleSize + 3 + ca.resizing.adjustY, 'c', 'f','gray']);
+        pa2(co, [ 'b', 'm', ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX, ca.height - resizeHandleSize + ca.resizing.adjustY, 'l',ca.width - (resizeHandleSize / 2) + 3 + ca.resizing.adjustX, ca.height - resizeHandleSize + 3 + ca.resizing.adjustY, 'l',ca.width - (resizeHandleSize / 2) - 3 + ca.resizing.adjustX, ca.height - resizeHandleSize + 3 + ca.resizing.adjustY, 'c', 'f','gray']);
 
         // Bottom arrow head
-        pa(co, ['b','m', ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX, ca.height + ca.resizing.adjustY,'l', ca.width - (resizeHandleSize / 2) + 3 + ca.resizing.adjustX, ca.height - 3 + ca.resizing.adjustY,'l', ca.width - (resizeHandleSize / 2) - 3 + ca.resizing.adjustX, ca.height - 3 + ca.resizing.adjustY,'c','f', 'gray']);
+        pa2(co, ['b','m', ca.width - (resizeHandleSize / 2) + ca.resizing.adjustX, ca.height + ca.resizing.adjustY,'l', ca.width - (resizeHandleSize / 2) + 3 + ca.resizing.adjustX, ca.height - 3 + ca.resizing.adjustY,'l', ca.width - (resizeHandleSize / 2) - 3 + ca.resizing.adjustX, ca.height - 3 + ca.resizing.adjustY,'c','f', 'gray']);
 
         // Left arrow head
-        pa(co, ['b','m', ca.width - resizeHandleSize + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'l', ca.width - resizeHandleSize + 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + 3 + ca.resizing.adjustY,'l', ca.width - resizeHandleSize + 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 3 + ca.resizing.adjustY,'c','f', 'gray']);
+        pa2(co, ['b','m', ca.width - resizeHandleSize + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'l', ca.width - resizeHandleSize + 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + 3 + ca.resizing.adjustY,'l', ca.width - resizeHandleSize + 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 3 + ca.resizing.adjustY,'c','f', 'gray']);
         
         // Right arrow head
-        pa(co, ['b','m',ca.width + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'l',ca.width - 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + 3 + ca.resizing.adjustY,'l',ca.width  - 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 3 + ca.resizing.adjustY,'c','f', 'gray']);
+        pa2(co, ['b','m',ca.width + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'l',ca.width - 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + 3 + ca.resizing.adjustY,'l',ca.width  - 3 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 3 + ca.resizing.adjustY,'c','f', 'gray']);
         
         // Square at the centre of the arrows
-        pa(co, ['b','m',ca.width + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'r',ca.width - (resizeHandleSize / 2) - 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 2 + ca.resizing.adjustY, 4, 4,'r',ca.width - (resizeHandleSize / 2) - 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 2 + ca.resizing.adjustY, 4, 4,'s','gray','f','white']);
+        pa2(co, ['b','m',ca.width + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'r',ca.width - (resizeHandleSize / 2) - 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 2 + ca.resizing.adjustY, 4, 4,'r',ca.width - (resizeHandleSize / 2) - 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 2 + ca.resizing.adjustY, 4, 4,'s','gray','f','white']);
 
         // Draw the "Reset" button
-        pa(co, ['b','m',ma.round(ca.width - resizeHandleSize - 3 + ca.resizing.adjustX), ca.height - resizeHandleSize / 2 + ca.resizing.adjustY,'l',ma.round(ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX), ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'l',ca.width - resizeHandleSize - resizeHandleSize + 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 2 + ca.resizing.adjustY,'l',ca.width - resizeHandleSize - resizeHandleSize + 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + 2 + ca.resizing.adjustY,'l',ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'s','gray','f','gray']);
+        pa2(co, ['b','m',ma.round(ca.width - resizeHandleSize - 3 + ca.resizing.adjustX), ca.height - resizeHandleSize / 2 + ca.resizing.adjustY,'l',ma.round(ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX), ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'l',ca.width - resizeHandleSize - resizeHandleSize + 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) - 2 + ca.resizing.adjustY,'l',ca.width - resizeHandleSize - resizeHandleSize + 2 + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + 2 + ca.resizing.adjustY,'l',ca.width - resizeHandleSize - resizeHandleSize + ca.resizing.adjustX, ca.height - (resizeHandleSize / 2) + ca.resizing.adjustY,'s','gray','f','gray']);
 
         // The vertical line at the end of the reset button
-        pa(co, ['b','m', ma.round(ca.width - resizeHandleSize - resizeHandleSize - 1 + ca.resizing.adjustX), ca.height - (resizeHandleSize / 2) - 3 + ca.resizing.adjustY,'l', ma.round(ca.width - resizeHandleSize - resizeHandleSize - 1 + ca.resizing.adjustX), ca.height - (resizeHandleSize / 2) + 3 + ca.resizing.adjustY,'s','f']);
+        pa2(co, ['b','m', ma.round(ca.width - resizeHandleSize - resizeHandleSize - 1 + ca.resizing.adjustX), ca.height - (resizeHandleSize / 2) - 3 + ca.resizing.adjustY,'l', ma.round(ca.width - resizeHandleSize - resizeHandleSize - 1 + ca.resizing.adjustX), ca.height - (resizeHandleSize / 2) + 3 + ca.resizing.adjustY,'s','f']);
 
 
 
@@ -142,8 +153,9 @@ ca.style.left  = 0;
 
             var window_onmousemove = function (e)
             {
-                var ca = active;
-                
+                var ca  = active,
+                    obj = ca ? ca.__object__ : null;
+
                 if (ca) {
 
                     e = RG.fixEventObject(e);
@@ -153,11 +165,13 @@ ca.style.left  = 0;
                         var newWidth  = ca.width + (e.pageX - ca.resizing.originalx);
                         var newHeight = ca.height + (e.pageY - ca.resizing.originaly);
 
-                        if (newWidth > (ca.resizing.originalw / 2)) {
+                        if (    newWidth > (ca.resizing.originalw / 2)
+                            && (typeof obj.get('resizableMaxwidth') === 'number' ? newWidth < obj.get('resizableMaxwidth') : true)
+                           ) {
                             ca.resizing.div.style.width = newWidth + 'px';
                         }
                         
-                        if (newHeight > (ca.resizing.originalh / 2)) {
+                        if (newHeight > (ca.resizing.originalh / 2) && (typeof obj.get('resizableMaxheight') === 'number' ? newHeight < obj.get('resizableMaxheight') : true) ) {
                             ca.resizing.div.style.height = newHeight + 'px';
                         }
                         
@@ -165,10 +179,13 @@ ca.style.left  = 0;
                     }
                 }
             }
+
+
+
             // Install the function as an event listener - but only once
-            if (typeof(canvas.rgraph_resize_window_mousemove_listener_installed) != 'boolean') {
+            if (typeof ca.rgraph_resize_window_mousemove_listener_installed != 'boolean') {
                 window.addEventListener('mousemove', window_onmousemove, false);
-                canvas.rgraph_resize_window_mousemove_listener_installed = true;
+                ca.rgraph_resize_window_mousemove_listener_installed = true;
             }
 
             // The window onmouseup function
@@ -244,7 +261,7 @@ ca.style.left  = 0;
                 
 
                     // Fire the onresize event
-                    RG.fireCustomEvent(canvas.__object__, 'onresizebeforedraw');
+                    RG.fireCustomEvent(ca.__object__, 'onresizebeforedraw');
 
                     RG.redrawCanvas(ca);
                     

data/vendor/assets/javascripts/RGraph.common.sheets.js

@@ -1,4 +1,4 @@
-// version: 2016-02-06
+// version: 2016-06-04
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -7,7 +7,7 @@
     * |                                                                                |
     * | RGraph is dual licensed under the Open Source GPL (General Public License)     |
     * | v2.0 license and a commercial license which means that you're not bound by     |
-    * | the terms of the GPL. The commercial license starts at just �99 (GBP) and      |
+    * | the terms of the GPL. The commercial license starts at just 99 GBP and      |
     * | you can read about it here:                                                    |
     * |                                                                                |
     * |                      http://www.rgraph.net/license                             |

data/vendor/assets/javascripts/RGraph.common.tooltips.js

@@ -1,4 +1,4 @@
-// version: 2016-02-06
+// version: 2016-06-04
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -7,7 +7,7 @@
     * |                                                                                |
     * | RGraph is dual licensed under the Open Source GPL (General Public License)     |
     * | v2.0 license and a commercial license which means that you're not bound by     |
-    * | the terms of the GPL. The commercial license starts at just �99 (GBP) and      |
+    * | the terms of the GPL. The commercial license starts at just 99 GBP and      |
     * | you can read about it here:                                                    |
     * |                                                                                |
     * |                      http://www.rgraph.net/license                             |
@@ -58,10 +58,17 @@
         /**
         * chart.tooltip.override allows you to totally take control of rendering the tooltip yourself
         */
-        if (typeof(obj.Get('chart.tooltips.override')) == 'function') {
-            return obj.Get('chart.tooltips.override')(obj, text, x, y, idx);
+        if (typeof(obj.get('chart.tooltips.override')) == 'function') {
+            return obj.get('chart.tooltips.override')(obj, text, x, y, idx);
         }
 
+
+        /**
+        * Fire the beforetooltip event
+        */
+        RG.fireCustomEvent(obj, 'onbeforetooltip');
+
+
         /**
         * Save the X/Y coords
         */
@@ -71,25 +78,25 @@
         /**
         * This facilitates the "id:xxx" format
         */
-        text = RGraph.getTooltipTextFromDIV(text);
+        text = RG.getTooltipTextFromDIV(text);
 
         /**
         * First clear any exising timers
         */
-        var timers = RGraph.Registry.Get('chart.tooltip.timers');
+        var timers = RG.Registry.Get('chart.tooltip.timers');
 
         if (timers && timers.length) {
             for (i=0; i<timers.length; ++i) {
                 clearTimeout(timers[i]);
             }
         }
-        RGraph.Registry.Set('chart.tooltip.timers', []);
+        RG.Registry.Set('chart.tooltip.timers', []);
 
         /**
         * Hide the context menu if it's currently shown
         */
         if (obj.Get('chart.contextmenu')) {
-            RGraph.HideContext();
+            RG.hideContext();
         }
 
         var effect = obj.Get('chart.tooltips.effect') ? obj.Get('chart.tooltips.effect').toLowerCase() : 'fade';
@@ -101,24 +108,19 @@
         var tooltipObj  = document.createElement('DIV');
         tooltipObj.className             = obj.Get('chart.tooltips.css.class');
         tooltipObj.style.display         = 'none';
-        tooltipObj.style.position        = RGraph.isFixed(obj.canvas) ? 'fixed' : 'absolute';
+        tooltipObj.style.position        = RG.isFixed(obj.canvas) ? 'fixed' : 'absolute';
         tooltipObj.style.left            = 0;
         tooltipObj.style.top             = 0;
         tooltipObj.style.backgroundColor = 'rgb(255,255,239)';
         tooltipObj.style.color           = 'black';
         if (!document.all) tooltipObj.style.border = '';
         tooltipObj.style.visibility      = 'visible';
-        tooltipObj.style.paddingLeft     = RGraph.tooltips.padding;
-        tooltipObj.style.paddingRight    = RGraph.tooltips.padding;
-        tooltipObj.style.fontFamily      = RGraph.tooltips.font_face;
-        tooltipObj.style.fontSize        = RGraph.tooltips.font_size;
+        tooltipObj.style.paddingLeft     = RG.tooltips.padding;
+        tooltipObj.style.paddingRight    = RG.tooltips.padding;
+        tooltipObj.style.fontFamily      = RG.tooltips.font_face;
+        tooltipObj.style.fontSize        = RG.tooltips.font_size;
         tooltipObj.style.zIndex          = 3;
 
-        // Only apply a border if there's content
-        if (RGraph.trim(text).length > 0) {
-            tooltipObj.style.border             = '1px #bbb solid';
-        }
-
         tooltipObj.style.borderRadius       = '5px';
         tooltipObj.style.MozBorderRadius    = '5px';
         tooltipObj.style.WebkitBorderRadius = '5px';
@@ -167,7 +169,7 @@
 
 
 
-        tooltipObj.style.top  = (y - height - 2) + 'px';
+        tooltipObj.style.top  = window.event.pageY - height - 5 + 'px';
 
         /**
         * If the function exists call the object specific tooltip positioning function
@@ -181,9 +183,15 @@
                 if (obj.Get('chart.tooltips.coords.page')) {
 
                     tooltipObj.style.left = e.pageX - (width / 2) - 4.25 + 'px';
-                    tooltipObj.style.top = e.pageY - height - 10 + 'px';
-                    
-                    document.getElementById('__rgraph_tooltip_pointer__').style.left = (parseInt(tooltipObj.offsetWidth) / 2)  - 8.5 + 'px';
+                    tooltipObj.style.top = e.pageY - height - 5 + 'px';
+
+                    // In case the value is negative - this positions the tooltip
+                    // underneath the click
+                    //if (obj.type === 'bar' && obj.data_arr[idx] < 0) {
+                        //tooltipObj.style.top = e.pageY + 10 + 'px';
+                    //}
+
+                    //document.getElementById('__rgraph_tooltip_pointer__').style.left = (parseInt(tooltipObj.offsetWidth) / 2)  - 8.5 + 'px';
                 }
             }
         } else {
@@ -226,7 +234,7 @@
         /**
         * Keep a reference to the tooltip in the registry
         */
-        RGraph.Registry.Set('chart.tooltip', tooltipObj);
+        RG.Registry.Set('chart.tooltip', tooltipObj);
 
         /**
         * Fire the tooltip event
@@ -263,16 +271,16 @@
     {
         var div = document.createElement('DIV');
             div.className             = obj.Get('chart.tooltips.css.class');
-            div.style.paddingLeft     = RGraph.tooltips.padding;
-            div.style.paddingRight    = RGraph.tooltips.padding;
-            div.style.fontFamily      = RGraph.tooltips.font_face;
-            div.style.fontSize        = RGraph.tooltips.font_size;
+            div.style.paddingLeft     = RG.tooltips.padding;
+            div.style.paddingRight    = RG.tooltips.padding;
+            div.style.fontFamily      = RG.tooltips.font_face;
+            div.style.fontSize        = RG.tooltips.font_size;
             div.style.visibility      = 'hidden';
             div.style.position        = 'absolute';
             div.style.top            = '300px';
             div.style.left             = 0;
             div.style.display         = 'inline';
-            div.innerHTML             = RGraph.getTooltipTextFromDIV(text);
+            div.innerHTML             = RG.getTooltipTextFromDIV(text);
         document.body.appendChild(div);
 
         return div.offsetWidth;
@@ -285,14 +293,14 @@
     RG.hideTooltip =
     RG.HideTooltip = function ()
     {
-        var tooltip = RGraph.Registry.Get('chart.tooltip');
+        var tooltip = RG.Registry.Get('chart.tooltip');
         var uid     = arguments[0] && arguments[0].uid ? arguments[0].uid : null;
 
         if (tooltip && tooltip.parentNode && (!uid || uid == tooltip.__canvas__.uid)) {
             tooltip.parentNode.removeChild(tooltip);
             tooltip.style.display = 'none';                
             tooltip.style.visibility = 'hidden';
-            RGraph.Registry.Set('chart.tooltip', null);
+            RG.Registry.Set('chart.tooltip', null);
         }
     };
 
@@ -498,7 +506,7 @@
     {
         var tooltips = obj.Get('chart.tooltips');
         
-        if (RGraph.hasTooltips(obj)) {
+        if (RG.hasTooltips(obj)) {
         
             if (obj.type == 'rscatter') {
                 tooltips = [];
@@ -558,7 +566,7 @@
             && obj.Get('chart.tooltips')[shape['index']]
            ) {
 
-            var text = RGraph.parseTooltipText(obj.Get('chart.tooltips'), shape['index']);
+            var text = RG.parseTooltipText(obj.Get('chart.tooltips'), shape['index']);
 
             if (text) {
 
@@ -571,15 +579,15 @@
 
                     // Show the tooltip if it's not the same as the one already visible
                     if (
-                           !RGraph.Registry.Get('chart.tooltip')
-                        || RGraph.Registry.Get('chart.tooltip').__object__.uid != obj.uid
-                        || RGraph.Registry.Get('chart.tooltip').__index__ != shape['index']
+                           !RG.Registry.Get('chart.tooltip')
+                        || RG.Registry.Get('chart.tooltip').__object__.uid != obj.uid
+                        || RG.Registry.Get('chart.tooltip').__index__ != shape['index']
                        ) {
 
-                        RGraph.HideTooltip();
-                        RGraph.Clear(obj.canvas);
-                        RGraph.Redraw();
-                        RGraph.Tooltip(obj, text, e.pageX, e.pageY, shape['index']);
+                        RG.hideTooltip();
+                        RG.Clear(obj.canvas);
+                        RG.redraw();
+                        RG.tooltip(obj, text, e.pageX, e.pageY, shape['index']);
                         obj.Highlight(shape);
                     }
                 }
@@ -590,7 +598,7 @@
         */
         } else if (shape && typeof(shape['index']) == 'number') {
 
-            var text = RGraph.parseTooltipText(obj.Get('chart.tooltips'), shape['index']);
+            var text = RG.parseTooltipText(obj.Get('chart.tooltips'), shape['index']);
 
             if (text) {
                 changeCursor_tooltips = true