Commits

Anonymous committed 255475c

Some improvements to build and doc menu.
Try out a path declaration for plugins.

Comments (0)

Files changed (5)

    File: DivTitleRenderer  (jqplot.divTitleRenderer.js)
    File: LinearAxisRenderer  (jqplot.linearAxisRenderer.js)
    File: MarkerRenderer  (jqplot.markerRenderer.js)
+   File: ShapeRenderer  (jqplot.shapeRenderer.js)
+   File: ShadowRenderer  (jqplot.shadowRenderer.js)
    }  # Group: Default Renderers
 
 Group: Plugin Renderers  {
    File: LogAxisRenderer  (plugins/jqplot.logAxisRenderer.js)
    File: CategoryAxisRenderer  (plugins/jqplot.categoryAxisRenderer.js)
    File: DateAxisRenderer  (plugins/jqplot.dateAxisRenderer.js)
+   File: BarRenderer (plugins/jqplot.barRenderer.js)
+   File: Cursor (plugins/jqplot.cursor.js)
+   File: Highlighter (plugins/jqplot.highlighter.js)
    }  # Group: Plugin Renderers
 
 Group: Index  {
    Index: Everything
    Class Index: Classes
    Property Index: Properties
+   Function Index: Functions
    }  # Group: Index
 
 
     <target name="dist" description="Build uncompressed jqplot for distribution.">
         <echo message="Building jqPlot" />
-    	  <replaceregexp match="@VERSION" replace="${version}" file="${SRC_DIR}/jqplot.core.js" />
         <mkdir dir="${BUILD_DIR}" />
         <mkdir dir="${DIST_DIR}" />
         <mkdir dir="${BUILD_DIR}/plugins" />
             <exclude name="jquery.jqplot.js" />
           </fileset>
         </copy>
+    	  <replaceregexp match="@VERSION" replace="${version}" file="${BUILD_DIR}/jqplot.core.js" />
         <copy todir="${BUILD_DIR}/plugins">
           <fileset dir="${SRC_DIR}/plugins" includes="*" />
         </copy>
     <replaceregexp match="\.\./src/" replace="\.\./" flags="g" file="${DIST_DIR}/tests/index.html" />
 		<echo message="Test Suite Finished" />
 	</target>
-	
-<!--
-	<target name="mintests" depends="tests, min">
-	  <echo message="Modifying test suite to use minified distribution" />
-    <replaceregexp match="jquery\.jqplot\.js" replace="jquery\.jqplot\.min\.js" file="${DIST_DIR}/tests/index.html" />
-    <replaceregexp match="/jqplot\.([a-zA-Z0-9_-]+)\.js" replace="/jqplot\.\1\.min\.js" flags="g" file="${DIST_DIR}/tests/index.html" />
-  </target>
--->
 
 	<target name="docs" depends="dist" description="Create documentation for distribution.">
 		<echo message="Creating documentation" />

src/jqplot.core.js

 * 
 * About: Version
 *
-* Version: 0.4.0 
+* @VERSION 
 * 
 * About: Copyright
 * 
     
     $.jqplot.debug = 1;
     
+    // path to jqplot install, relative to the script that is including jqplot.
+    $.jqplot.installPath = 'jqplot';
+    $.jqplot.pluginsPath = 'jqplot/plugins';
+    
     $.jqplot.preInitHooks = [];
     $.jqplot.postInitHooks = [];
     $.jqplot.preParseOptionsHooks = [];

src/plugins/jqplot.cursor.js

 	$.jqplot.Cursor = function(options) {
 	    this.style = 'crosshair';
 	    this.show = true;
+	    // path to images, relative to this script. don't include initial "." or "./"
+	    this.imagePath = '';
 
 	    $.extend(true, this, options);
 	}
 	function handleMove() {};
 	
 	function handleMouseEnter(ev, gridpos, datapos, neighbors, plot) {
-	    ev.target.style.cursor = "url('./src/plugins/crosscursor.png'), crosshair";
+	    ev.target.style.cursor = "url('"+$.jqplot.pluginsPath+"/"+plot.cursor.imagePath+"/crosscursor.png'), crosshair";
 	};
 	
 	function handleMouseLeave(ev, gridpos, datapos, neighbors, plot) {
   <!-- END: load jqplot -->
 
   <script language="javascript" type="text/javascript">
+    $.jqplot.installPath = "../src";
+    $.jqplot.pluginsPath = "../src/plugins";
     var uID = (function() {
       var id = 1;
       return function(){return id++};
         
       genplot(o);
   
-      //prettyPrint();
+      prettyPrint();
       
       JSpec.options.profile = false;
       JSpec