Commits

Anonymous committed f1a00b8

changing paths

  • Participants
  • Parent commits dd12e4b

Comments (0)

Files changed (2)

 
 if(!(window.JSON && window.JSON.parse && window.JSON.stringify))
     document.write('<script type="text/javascript" src="' 
-        + HTRAF.prefix + '/js/lib/json2.js"></script>');
+        + HTRAF.prefix + '/lib/json2.js"></script>');
 
 // Always include jquery.ui since already included may lack some widgets
 // TODO: optimize size later: all-in-one or part by part?
 document.write('<script type="text/javascript" src="' 
-    + HTRAF.prefix + '/js/lib/jquery.blockUI.js"></script>');
-document.write('<script type="text/javascript" src="' 
-    + HTRAF.prefix + '/js/lib/jquery-ui-1.8.5.custom.min.js"></script>');
-document.write('<link rel="stylesheet" type="text/css" href="'
-    + HTRAF.prefix + '/css/lib/jquery-ui-1.8.5.custom.css"/>');
+    + HTRAF.prefix + '/lib/jquery.blockUI.js"></script>');
+document.write('<script type="text/javascript" src="' + HTRAF.prefix 
+    + '/lib/jqueryui/jquery-ui-1.8.13.custom.min.js"></script>');
 
 // HTRAF files
 document.write('<script type="text/javascript" src="' 

htraf/jquery.htraf.js

             case 'stack':
             case 'bar': return [].concat([
                 {
-                    js: HTRAF.prefix + '/js/lib/jqplot/plugins/'
+                    js: HTRAF.prefix + '/lib/jqplot/plugins/'
                         + 'jqplot.barRenderer.min.js',
                     check: function() {
                         return $.jqplot && $.jqplot.BarRenderer;
                     }
                 },
                 {
-                    js: HTRAF.prefix + '/js/lib/jqplot/plugins/'
+                    js: HTRAF.prefix + '/lib/jqplot/plugins/'
                         + 'jqplot.categoryAxisRenderer.min.js',
                     check: function() {
                         return $.jqplot && $.jqplot.CategoryAxisRenderer;
             ], 
             !attrs.xVertical ? []:[
                 {
-                    js: HTRAF.prefix + '/js/lib/jqplot/plugins/'
+                    js: HTRAF.prefix + '/lib/jqplot/plugins/'
                         + 'jqplot.canvasTextRenderer.min.js',
                     check: function() {
                         return $.jqplot && $.jqplot.CanvasFontRenderer
                     }
                 },
                 {
-                    js: HTRAF.prefix + '/js/lib/jqplot/plugins/'
+                    js: HTRAF.prefix + '/lib/jqplot/plugins/'
                         + 'jqplot.canvasAxisTickRenderer.min.js',
                     check: function() {
                         return $.jqplot && $.jqplot.CanvasAxisTickRenderer
             ]);
             case 'line': return [
                 {
-                    js: HTRAF.prefix + '/js/lib/jqplot/plugins/'
+                    js: HTRAF.prefix + '/lib/jqplot/plugins/'
                         + 'jqplot.dateAxisRenderer.min.js',
                     check: function() {
                         return $.jqplot && $.jqplot.DateAxisRenderer;
                 }
             ];
             case 'pie': return [{
-                js: HTRAF.prefix + '/js/lib/jqplot/plugins/'
+                js: HTRAF.prefix + '/lib/jqplot/plugins/'
                     + 'jqplot.pieRenderer.min.js',
                 check: function() {
                     return $.jqplot && $.jqplot.PieRenderer;
         var self = this, load = $.htraf.Base.prototype.load;
         var files = [
             {
-                js: HTRAF.prefix + '/js/lib/jqplot/jquery.jqplot.min.js',
-                css: HTRAF.prefix + '/css/lib/jquery.jqplot.min.css',
+                js: HTRAF.prefix + '/lib/jqplot/jquery.jqplot.min.js',
+                css: HTRAF.prefix + '/lib/jquery.jqplot.min.css',
                 check: function() {
                     return $.jqplot;
                 }
         ];
         if($.browser.msie)
             files.unshift({
-                js: HTRAF.prefix + '/js/lib/jqplot/excanvas.min.js',
+                js: HTRAF.prefix + '/lib/jqplot/excanvas.min.js',
                 check: function() {
                     return window.CanvasPattern;
                 }
 
             case 'line': {
                 var type = data.headers[0].domain;
-                var xaxis = (type == 'number') ? {tickOptions:{formatString:'%d'}} : {
+                var xaxis = (type == 'number') ? {
+                    tickOptions: {formatString: '%d'}
+                } 
+                : {
                     renderer: $.jqplot.DateAxisRenderer,
                     tickOptions: {
                         formatString: '%Y-%m-%d'
                     }
                 };
-                var yaxis = (attrs.yInt) ? {tickOptions:{formatString:'%d'}} : {};
+                var yaxis = (attrs.yInt) ? 
+                            {tickOptions: {formatString: '%d'}} : {};
                 return $.extend(config, {
                     series: labels(),
                     axes: {