Commits

tomasc committed 3909627 Merge

merges

Comments (0)

Files changed (49)

       <arg value="-n"/>
     </exec>
 
+    <exec executable="hg" outputproperty="REVISION">
+      <arg value="id"/>
+      <arg value="-n"/>
+    </exec>
+
     <!-- MAIN -->
        
     <target name="build" depends="clean" description="create and populate build area for making distribution">
           <fileset dir="${SRC_DIR}/plugins" includes="*" />
         </copy>
         
-        <replaceregexp match="@VERSION" flags="g" replace="${version}r${HG_ID}">
+        <replaceregexp match="@VERSION" flags="g" replace="${version}">
 			<fileset dir="${BUILD_DIR}" includes="jqplot.*.js"/>
 		</replaceregexp>
         
-        <replaceregexp match="@VERSION" flags="g" replace="${version}r${HG_ID}">
+        <replaceregexp match="@VERSION" flags="g" replace="${version}">
 			<fileset dir="${BUILD_DIR}/plugins" includes="jqplot.*.js"/>
 		</replaceregexp>
+        
+        <replaceregexp match="@REVISION" flags="g" replace="${REVISION}">
+      <fileset dir="${BUILD_DIR}" includes="jqplot.*.js"/>
+    </replaceregexp>
+        
+        <replaceregexp match="@REVISION" flags="g" replace="${REVISION}">
+      <fileset dir="${BUILD_DIR}/plugins" includes="jqplot.*.js"/>
+    </replaceregexp>
                 
         <!-- remove appropriate opening and closing of closures -->
         <replaceregexp match=".*?\(function\(\$\) \{" replace="" flags="s" encoding="UTF8">

examples/area.php

 .jqplot-target {
     margin: 30px;
 }
+
+#customTooltipDiv {
+    position: absolute; 
+    display: none; 
+    color: #333333;
+    font-size: 0.8em;
+    border: 1px solid #666666; 
+    background-color: rgba(160, 160, 160, 0.2);
+    padding: 2px;
+}
 </style>
 
 <p>Area charts support highlighting and mouse events by default.  The options and handlers and callbacks are essentially the same as with bar, pie, donut and funnel charts.  One notable exception for area charts is that no data point index will be provided to the callback and the entire data set for the highlighted area will be returned.  This is because the area is not associated with one particular data point, but with the entire data set of the series.</p>
 <div><span>You Clicked: </span><span id="info1c">Nothing yet</span></div>
 
 <div id="chart1c" style="width:400px;height:260px;"></div>
+
+<div id="chart2" style="width:600px;height:260px;"></div>
+
+<div id="customTooltipDiv">I'm a tooltip.</div>
   
 
 
 });
 </script>
 
+
+<script class="code" language="javascript" type="text/javascript">
+$(document).ready(function(){
+    var l6 = [11, 9, 5, 12, 14, 8, 7, 9, 6, 11, 9, 3, 4];
+    var l7 = [4, 8, 5, 3, 6, 5, 3, 2, 6, 7, 4, 3, 2];
+    var l8 = [12, 6, 13, 11, 2, 3, 4, 2, 1, 5, 7, 4, 8];
+
+    var ticks = [[1,'Dec 10'], [2,'Jan 11'], [3,'Feb 11'], [4,'Mar 11'], [5,'Apr 11'], [6,'May 11'], [7,'Jun 11'], [8,'Jul 11'], [9,'Aug 11'], [10,'Sep 11'], [11,'Oct 11'], [12,'Nov 11'], [13,'Dec 11']];  
+
+    
+    plot2 = $.jqplot('chart2',[l6, l7, l8],{
+       stackSeries: true,
+       showMarker: false,
+       highlighter: {
+        show: true,
+        showTooltip: false
+       },
+       seriesDefaults: {
+           fill: true,
+       },
+       series: [
+        {label: 'Beans'},
+        {label: 'Oranges'},
+        {label: 'Crackers'}
+       ],
+       legend: {
+        show: true,
+        placement: 'outsideGrid'
+       },
+       grid: {
+        drawBorder: false,
+        shadow: false
+       },
+       axes: {
+           xaxis: {
+              ticks: ticks,
+              tickRenderer: $.jqplot.CanvasAxisTickRenderer,
+              tickOptions: {
+                angle: -90 
+              },
+              drawMajorGridlines: false
+          }           
+        }
+    });
+    
+    // capture the highlighters highlight event and show a custom tooltip.
+    $('#chart2').bind('jqplotHighlighterHighlight', 
+        function (ev, seriesIndex, pointIndex, data, plot) {
+            // create some content for the tooltip.  Here we want the label of the tick,
+            // which is not supplied to the highlighters standard tooltip.
+            var content = plot.series[seriesIndex].label + ', ' + plot.series[seriesIndex]._xaxis.ticks[pointIndex][1] + ', ' + data[1];
+            // get a handle on our custom tooltip element, which was previously created
+            // and styled.  Be sure it is initiallly hidden!
+            var elem = $('#customTooltipDiv');
+            elem.html(content);
+            // Figure out where to position the tooltip.
+            var h = elem.outerHeight();
+            var w = elem.outerWidth();
+            var left = ev.pageX - w - 10;
+            var top = ev.pageY - h - 10;
+            // now stop any currently running animation, position the tooltip, and fade in.
+            elem.stop(true, true).css({left:left, top:top}).fadeIn(200);
+        }
+    );
+    
+    // Hide the tooltip when unhighliting.
+    $('#chart2').bind('jqplotHighlighterUnhighlight', 
+        function (ev) {
+            $('#customTooltipDiv').fadeOut(300);
+        }
+    );
+});
+</script>
+
 <!-- End example scripts -->
 
 <!-- Don't touch this! -->
 
 <!-- Additional plugins go here -->
 
-  <script class="include" type="text/javascript" src="../src/plugins/jqplot.barRenderer.js"></script>
   <script class="include" type="text/javascript" src="../src/plugins/jqplot.categoryAxisRenderer.js"></script>
+  <script class="include" type="text/javascript" src="../src/plugins/jqplot.highlighter.js"></script>
+  <script class="include" type="text/javascript" src="../src/plugins/jqplot.canvasTextRenderer.js"></script>
+  <script class="include" type="text/javascript" src="../src/plugins/jqplot.canvasAxisTickRenderer.js"></script>
 
 <!-- End additional plugins -->
 

src/jqplot.axisLabelRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.axisTickRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.canvasGridRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.core.js

  * 
  * About: Version
  * 
- * @VERSION 
+ * version: @VERSION 
+ * revision: @REVISION
  * 
  * About: Copyright & License
  * 
     };
 
     $.jqplot.version = "@VERSION";
+    $.jqplot.revision = "@REVISION";
 
     $.jqplot.targetCounter = 1;
 

src/jqplot.divTitleRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.linePattern.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.lineRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.linearAxisRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.linearTickGenerator.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.markerRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.shadowRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.shapeRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.sprintf.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.tableLegendRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.themeEngine.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jqplot.toImage.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/jquery.jqplot.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.BezierCurveRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.barRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.blockRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.bubbleRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.canvasAxisLabelRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.canvasAxisTickRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.canvasOverlay.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.canvasTextRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.categoryAxisRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.ciParser.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.cursor.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.dateAxisRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.donutRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.dragable.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.enhancedLegendRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.funnelRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.highlighter.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 
         var c = plot.plugins.cursor;
         if (hl.show) {
             if (neighbor == null && hl.isHighlighting) {
+                var evt = jQuery.Event('jqplotHighlighterUnhighlight');
+                plot.target.trigger(evt);
+
                 var ctx = hl.highlightCanvas._ctx;
                 ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
                 if (hl.fadeTooltip) {
                 ctx = null;
             }
             else if (neighbor != null && plot.series[neighbor.seriesIndex].showHighlight && !hl.isHighlighting) {
+                var evt = jQuery.Event('jqplotHighlighterHighlight');
+                evt.which = ev.which;
+                evt.pageX = ev.pageX;
+                evt.pageY = ev.pageY;
+                var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data, plot];
+                plot.target.trigger(evt, ins);
+
                 hl.isHighlighting = true;
                 hl.currentNeighbor = neighbor;
                 if (hl.showMarker) {

src/plugins/jqplot.logAxisRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.mekkoAxisRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.mekkoRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.meterGaugeRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.mobile.js

  * jQuery Mobile virtual event support.
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2011 Takashi Okamoto
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.ohlcRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.pieRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.pointLabels.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.pyramidAxisRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.pyramidGridRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.pyramidRenderer.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 

src/plugins/jqplot.trendline.js

  * Pure JavaScript plotting plugin using jQuery
  *
  * Version: @VERSION
+ * Revision: @REVISION
  *
  * Copyright (c) 2009-2011 Chris Leonello
  * jqPlot is currently available for use in all personal or commercial projects 
-1.0.0b2_
+1.0.1
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.