[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19162-g85a990f

17 Sep 2011

The branch, master has been updated
       via  85a990fabd4a3239f011f8d168be8558a802f96a (commit)
       via  1371398618fceb23db86e35252e1062c2c359bc7 (commit)
       via  472350cf97095c70c163d70539b5f963d4ce1cbb (commit)
       via  edeba16cd76a6b48f22867dd6d6c2bbc9ed85d44 (commit)
       via  5643a33596f72a3a9b354a9ebd079ed36cd824ec (commit)
       via  5c03bd90e1466b2bad378e5400193a593535bb10 (commit)
       via  b8815ca7669feddb50dfb670f97281e87c3d9b62 (commit)
       via  3936aab8804630a31afc98802afad3f7b27a28f7 (commit)
       via  a61891560ff97a98a8339e1151330203dc0ccafd (commit)
       via  fbcc3eb3a2d1f33f8a6d3e0f89f06ec82ab2d94c (commit)
      from  dc35ecf227db206998ce20517b4e51ef05342f39 (commit)
- Log -----------------------------------------------------------------
commit 85a990fabd4a3239f011f8d168be8558a802f96a
Merge: 1371398 dc35ecf
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 19:41:45 2011 +0530
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 1371398618fceb23db86e35252e1062c2c359bc7
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 19:36:59 2011 +0530
Remove trailing white spaces
commit 472350cf97095c70c163d70539b5f963d4ce1cbb
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 19:28:35 2011 +0530
Spaces to make the code more readable
commit edeba16cd76a6b48f22867dd6d6c2bbc9ed85d44
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 19:06:18 2011 +0530
Proper indentation
commit 5643a33596f72a3a9b354a9ebd079ed36cd824ec
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 18:48:45 2011 +0530
Adding missing semicolons
commit 5c03bd90e1466b2bad378e5400193a593535bb10
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 18:46:09 2011 +0530
Fixing indentation
commit b8815ca7669feddb50dfb670f97281e87c3d9b62
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 18:30:46 2011 +0530
Always use curly braces with 'if' and 'else'
commit 3936aab8804630a31afc98802afad3f7b27a28f7
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 18:24:36 2011 +0530
More indentation problems fixed
commit a61891560ff97a98a8339e1151330203dc0ccafd
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 18:09:55 2011 +0530
Proper indentation
commit fbcc3eb3a2d1f33f8a6d3e0f89f06ec82ab2d94c
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sat Sep 17 18:04:40 2011 +0530
Added missing semicolons
-----------------------------------------------------------------------
Summary of changes:
 js/tbl_zoom_plot.js |  778 ++++++++++++++++++++++++++-------------------------
 1 files changed, 391 insertions(+), 387 deletions(-)

diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js
index b8c4259..788ca63 100644
--- a/js/tbl_zoom_plot.js
+++ b/js/tbl_zoom_plot.js
@@ -11,7 +11,7 @@
  **  Display Help/Info
  **/
 function displayHelp() {
-    var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'],10000);
+    var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'], 10000);
     msgbox.click(function() {
         PMA_ajaxRemoveMessage(msgbox);
     });
@@ -23,7 +23,7 @@ function displayHelp() {
  **/
 Array.max = function (array) {
     return Math.max.apply( Math, array );
-}
+};
/**
  ** Extend the array object for min function
@@ -31,11 +31,11 @@ Array.max = function (array) {
  **/
 Array.min = function (array) {
     return Math.min.apply( Math, array );
-}
+};
/**
  ** Checks if a string contains only numeric value
- ** @param n: String (to be checked) 
+ ** @param n: String (to be checked)
  **/
 function isNumeric(n) {
     return !isNaN(parseFloat(n)) && isFinite(n);
@@ -43,7 +43,7 @@ function isNumeric(n) {
/**
  ** Checks if an object is empty
- ** @param n: Object (to be checked) 
+ ** @param n: Object (to be checked)
  **/
 function isEmpty(obj) {
     var name;
@@ -58,16 +58,16 @@ function isEmpty(obj) {
  ** @param val  Integer Timestamp
  ** @param type String  Field type(datetime/timestamp/time/date)
  **/
-function getDate(val,type) {
-    if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) {
-    return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val)
-    }    
-    else if(type.toString().search(/time/i) != -1) {
-        return Highcharts.dateFormat('%H:%M:%S', val)
-    }    
+function getDate(val, type) {
+    if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) {
+        return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val);
+    }
+    else if (type.toString().search(/time/i) != -1) {
+        return Highcharts.dateFormat('%H:%M:%S', val);
+    }
     else if (type.toString().search(/date/i) != -1) {
-        return Highcharts.dateFormat('%Y-%m-%e', val)
-    }    
+        return Highcharts.dateFormat('%Y-%m-%e', val);
+    }
 }
/**
@@ -75,42 +75,42 @@ function getDate(val,type) {
  ** @param val  String Date
  ** @param type Sring  Field type(datetime/timestamp/time/date)
  **/
-function getTimeStamp(val,type) {
-    if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) {
-    return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val)
-    }    
-    else if(type.toString().search(/time/i) != -1) {
-    return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss')
-    }    
+function getTimeStamp(val, type) {
+    if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) {
+        return getDateFromFormat(val, 'yyyy-MM-dd HH:mm:ss', val);
+    }
+    else if (type.toString().search(/time/i) != -1) {
+        return getDateFromFormat('1970-01-01 ' + val, 'yyyy-MM-dd HH:mm:ss');
+    }
     else if (type.toString().search(/date/i) != -1) {
-    return getDateFromFormat(val,'yyyy-MM-dd')
-    }    
+        return getDateFromFormat(val, 'yyyy-MM-dd');
+    }
 }
/**
  ** Classifies the field type into numeric,timeseries or text
  ** @param field: field type (as in database structure)
- **/ 
+ **/
 function getType(field) {
-    if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1)
+    if (field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1)
         return 'numeric';
-    else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1)
+    else if (field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1)
         return 'time';
     else
         return 'text';
 }
-/** 
+/**
  ** Converts a categorical array into numeric array
  ** @param array categorical values array
  **/
 function getCord(arr) {
     var newCord = new Array();
-    var original = $.extend(true,[],arr);
+    var original = $.extend(true, [], arr);
     var arr = jQuery.unique(arr).sort();
-    $.each(original, function(index,value) {
-        newCord.push(jQuery.inArray(value,arr));
+    $.each(original, function(index, value) {
+        newCord.push(jQuery.inArray(value, arr));
     });
-    return [newCord,arr,original];
+    return [newCord, arr, original];
 }
/**
@@ -140,23 +140,21 @@ function includePan(currentChart) {
     $('#querychart').mousemove(function(e) {
         if (mouseDown == 1) {
             if (e.pageX > lastX) {
-        var xExtremes = currentChart.xAxis[0].getExtremes();
+                var xExtremes = currentChart.xAxis[0].getExtremes();
                 var diff = (e.pageX - lastX) * (xExtremes.max - xExtremes.min) / chartWidth;
                 currentChart.xAxis[0].setExtremes(xExtremes.min - diff, xExtremes.max - diff);
-            }
-            else if (e.pageX < lastX) {
-        var xExtremes = currentChart.xAxis[0].getExtremes();
+            } else if (e.pageX < lastX) {
+                var xExtremes = currentChart.xAxis[0].getExtremes();
                 var diff = (lastX - e.pageX) * (xExtremes.max - xExtremes.min) / chartWidth;
                 currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff);
             }
if (e.pageY > lastY) {
-        var yExtremes = currentChart.yAxis[0].getExtremes();
+                var yExtremes = currentChart.yAxis[0].getExtremes();
                 var ydiff = 1.0 * (e.pageY - lastY) * (yExtremes.max - yExtremes.min) / chartHeight;
                 currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff);
-            }
-            else if (e.pageY < lastY) {
-        var yExtremes = currentChart.yAxis[0].getExtremes();
+            } else if (e.pageY < lastY) {
+                var yExtremes = currentChart.yAxis[0].getExtremes();
                 var ydiff = 1.0 * (lastY - e.pageY) * (yExtremes.max - yExtremes.min) / chartHeight;
                 currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff);
             }
@@ -176,7 +174,7 @@ $(document).ready(function() {
         cache: 'false'
     });
-    var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; 
+    var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer';
     var currentChart = null;
     var currentData = null;
     var xLabel = $('#tableid_0').val();
@@ -189,7 +187,7 @@ $(document).ready(function() {
     var zoomRatio = 1;
-    // Get query result 
+    // Get query result
     var data = jQuery.parseJSON($('#querydata').html());
/**
@@ -197,38 +195,39 @@ $(document).ready(function() {
      **/
     $('#tableid_0').change(function() {
           $('#zoom_search_form').submit();
-    })
+    });
$('#tableid_1').change(function() {
           $('#zoom_search_form').submit();
-    })
+    });
$('#tableid_2').change(function() {
           $('#zoom_search_form').submit();
-    })
+    });
$('#tableid_3').change(function() {
           $('#zoom_search_form').submit();
-    })
+    });
/**
      * Input form validation
-     **/ 
+     **/
     $('#inputFormSubmitId').click(function() {
-        if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0)         
-        PMA_ajaxShowMessage(PMA_messages['strInputNull']);
-    else if (xLabel == yLabel) 
+        if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) {
+            PMA_ajaxShowMessage(PMA_messages['strInputNull']);
+        } else if (xLabel == yLabel) {
             PMA_ajaxShowMessage(PMA_messages['strSameInputs']);
+        }
     });
/**
-      ** Prepare a div containing a link, otherwise it's incorrectly displayed 
+      ** Prepare a div containing a link, otherwise it's incorrectly displayed
       ** after a couple of clicks
       **/
     $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>')
-    .insertAfter('#zoom_search_form')
-    // don't show it until we have results on-screen
-    .hide();
+        .insertAfter('#zoom_search_form')
+        // don't show it until we have results on-screen
+        .hide();
$('#togglesearchformlink')
         .html(PMA_messages['strShowSearchCriteria'])
@@ -243,466 +242,471 @@ $(document).ready(function() {
          // avoid default click action
         return false;
      });
-    
-    /** 
+
+    /**
      ** Set dialog properties for the data display form
      **/
     $("#dataDisplay").dialog({
         autoOpen: false,
-    title: 'Data point content',
+        title: 'Data point content',
         modal: false, //false otherwise other dialogues like timepicker may not function properly
         height: $('#dataDisplay').height() + 80,
         width: $('#dataDisplay').width() + 80
     });
/*
-     * Handle submit of zoom_display_form 
+     * Handle submit of zoom_display_form
      */
-     
+
     $("#submitForm").click(function(event) {
-    
+
         //Prevent default submission of form
         event.preventDefault();
-    
-    //Find changed values by comparing form values with selectedRow Object
-    var newValues = new Array();//Stores the values changed from original
+
+        //Find changed values by comparing form values with selectedRow Object
+        var newValues = new Array();//Stores the values changed from original
         var it = 4;
         var xChange = false;
         var yChange = false;
-    for (key in selectedRow) {
-        if (key != 'where_clause'){
-        var oldVal = selectedRow[key];
-        var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val();
-        if (oldVal != newVal){
-            selectedRow[key] = newVal;
-            newValues[key] = newVal;
-            if(key == xLabel) {
-            xChange = true;
-               data[currentData][xLabel] = newVal;
-            }
-            else if(key == yLabel) {
-            yChange = true;
-               data[currentData][yLabel] = newVal;
+        for (key in selectedRow) {
+            if (key != 'where_clause') {
+                var oldVal = selectedRow[key];
+                var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val();
+                if (oldVal != newVal) {
+                    selectedRow[key] = newVal;
+                    newValues[key] = newVal;
+                    if (key == xLabel) {
+                        xChange = true;
+                        data[currentData][xLabel] = newVal;
+                    } else if (key == yLabel) {
+                        yChange = true;
+                        data[currentData][yLabel] = newVal;
+                    }
+                }
             }
-        }
-        }
-        it++    
-    }//End data update
-        
-    //Update the chart series and replot
+            it++;
+        } //End data update
+
+        //Update the chart series and replot
         if (xChange || yChange) {
-        var newSeries = new Array();
-        newSeries[0] = new Object();
+            var newSeries = new Array();
+            newSeries[0] = new Object();
             newSeries[0].marker = {
                 symbol: 'circle'
             };
-        //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary
-            if(xChange) {
-              xCord[currentData] = selectedRow[xLabel];
-        if(xType == 'numeric') {
-            currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] });
-            currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6);
-                }
-        else if(xType == 'time') {
-            currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())});
-        }
-        else {
-            var tempX = getCord(xCord);
-            var tempY = getCord(yCord);
-            var i = 0;
-                newSeries[0].data = new Array();
-            xCord = tempX[2];
-            yCord = tempY[2];
-
-                $.each(data,function(key,value) {
-                        if(yType != 'text')
-                 newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } );
-            else
+            //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary
+            if (xChange) {
+                xCord[currentData] = selectedRow[xLabel];
+                if (xType == 'numeric') {
+                    currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] });
+                    currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6, Array.max(xCord) + 6);
+                } else if (xType == 'time') {
+                    currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel], $('#types_0').val())});
+                } else {
+                    var tempX = getCord(xCord);
+                    var tempY = getCord(yCord);
+                    var i = 0;
+                    newSeries[0].data = new Array();
+                    xCord = tempX[2];
+                    yCord = tempY[2];
+
+                    $.each(data, function(key, value) {
+                        if (yType != 'text') {
+                            newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } );
+                        } else {
                             newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } );
-                    i++;   
+                        }
+                        i++;
                     });
-            currentSettings.xAxis.labels = { formatter : function() {
-                if(tempX[1][this.value] && tempX[1][this.value].length > 10)
-                    return tempX[1][this.value].substring(0,10)
-                else 
-                    return tempX[1][this.value];    
+                    currentSettings.xAxis.labels = {
+                        formatter : function() {
+                            if (tempX[1][this.value] && tempX[1][this.value].length > 10) {
+                                return tempX[1][this.value].substring(0, 10);
+                            } else {
+                                return tempX[1][this.value];
+                            }
                         }
-                    }
-             currentSettings.series = newSeries;
-                    currentChart = PMA_createChart(currentSettings);
-        }
-
-        }
-            if(yChange) {
+                     };
+                     currentSettings.series = newSeries;
+                     currentChart = PMA_createChart(currentSettings);
+                 }
-              yCord[currentData] = selectedRow[yLabel];
-        if(yType == 'numeric') {
-            currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] });
-            currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6);
-                }
-        else if(yType =='time') {
-            currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())});
-        }
-        else {
-            var tempX = getCord(xCord);
-            var tempY = getCord(yCord);
-            var i = 0;
-                newSeries[0].data = new Array();
-            xCord = tempX[2];
-            yCord = tempY[2];
-
-                $.each(data,function(key,value) {
-            if(xType != 'text' )
+            }
+            if (yChange) {
+                yCord[currentData] = selectedRow[yLabel];
+                if (yType == 'numeric') {
+                    currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] });
+                    currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6, Array.max(yCord) + 6);
+                } else if (yType == 'time') {
+                    currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel], $('#types_1').val())});
+                } else {
+                    var tempX = getCord(xCord);
+                    var tempY = getCord(yCord);
+                    var i = 0;
+                    newSeries[0].data = new Array();
+                    xCord = tempX[2];
+                    yCord = tempY[2];
+
+                    $.each(data, function(key, value) {
+                        if (xType != 'text' ) {
                             newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } );
-            else
+                        } else {
                             newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } );
-                    i++;   
+                        }
+                        i++;
                     });
-            currentSettings.yAxis.labels = { formatter : function() {
-                if(tempY[1][this.value] && tempY[1][this.value].length > 10)
-                    return tempY[1][this.value].substring(0,10)
-                else 
-                    return tempY[1][this.value];    
+                    currentSettings.yAxis.labels = {
+                        formatter : function() {
+                            if (tempY[1][this.value] && tempY[1][this.value].length > 10) {
+                                return tempY[1][this.value].substring(0, 10);
+                            } else {
+                                return tempY[1][this.value];
+                            }
                         }
-                    }
-             currentSettings.series = newSeries;
-                    currentChart = PMA_createChart(currentSettings); 
-        }
-        }
-        currentChart.series[0].data[currentData].select();
-        }
-    //End plot update    
+                     };
+                     currentSettings.series = newSeries;
+                     currentChart = PMA_createChart(currentSettings);
+                }
+            }
+            currentChart.series[0].data[currentData].select();
+        } //End plot update
-    //Generate SQL query for update
-    if (!isEmpty(newValues)) {
+        //Generate SQL query for update
+        if (!isEmpty(newValues)) {
             var sql_query = 'UPDATE `' + window.parent.table + '` SET ';
-        for (key in newValues) {
-            if(key != 'where_clause') {
-                sql_query += '`' + key + '`=' ;
-            var value = newValues[key];
-            if(!isNumeric(value) && value != null) 
-                sql_query += ''' + value + '' ,';
-            else
-                sql_query += value + ' ,';
-            }
-        }
-        sql_query = sql_query.substring(0, sql_query.length - 1);
-        sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']);
-        
-        //Post SQL query to sql.php    
-        $.post('sql.php', {
-                'token' : window.parent.token,
-                'db' : window.parent.db,
-                'ajax_request' : true,
-                'sql_query' : sql_query,
-            'inline_edit' : false
-            }, function(data) {
-                if(data.success == true) {
-                    $('#sqlqueryresults').html(data.sql_query);
-                $("#sqlqueryresults").trigger('appendAnchor');
+            for (key in newValues) {
+                if (key != 'where_clause') {
+                    sql_query += '`' + key + '`=' ;
+                    var value = newValues[key];
+                    if (!isNumeric(value) && value != null) {
+                        sql_query += ''' + value + '' ,';
+                    } else {
+                        sql_query += value + ' ,';
+                    }
                 }
-                else 
-                    PMA_ajaxShowMessage(data.error);
-        })//End $.post
-    }//End database update
-        $("#dataDisplay").dialog("close");    
-    });//End submit handler 
+            }
+            sql_query = sql_query.substring(0, sql_query.length - 1);
+            sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']);
+
+            //Post SQL query to sql.php
+            $.post('sql.php', {
+                    'token' : window.parent.token,
+                    'db' : window.parent.db,
+                    'ajax_request' : true,
+                    'sql_query' : sql_query,
+                    'inline_edit' : false
+                }, function(data) {
+                    if (data.success == true) {
+                        $('#sqlqueryresults').html(data.sql_query);
+                        $("#sqlqueryresults").trigger('appendAnchor');
+                    } else {
+                        PMA_ajaxShowMessage(data.error);
+                    }
+            }); //End $.post
+        }//End database update
+        $("#dataDisplay").dialog("close");
+    });//End submit handler
/*
      * Generate plot using Highcharts
-     */ 
+     */
if (data != null) {
         $('#zoom_search_form')
          .slideToggle()
          .hide();
         $('#togglesearchformlink')
-         .text(PMA_messages['strShowSearchCriteria'])
-    $('#togglesearchformdiv').show();
+         .text(PMA_messages['strShowSearchCriteria']);
+        $('#togglesearchformdiv').show();
         var selectedRow;
-        var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF'];
+        var colorCodes = ['#FF0000', '#00FFFF', '#0000FF', '#0000A0', '#FF0080', '#800080', '#FFFF00', '#00FF00', '#FF00FF'];
         var series = new Array();
         var xCord = new Array();
         var yCord = new Array();
-    var tempX, tempY;
+        var tempX, tempY;
         var it = 0;
-        var xMax; // xAxis extreme max 
-        var xMin; // xAxis extreme min 
-        var yMax; // yAxis extreme max 
-        var yMin; // yAxis extreme min 
+        var xMax; // xAxis extreme max
+        var xMin; // xAxis extreme min
+        var yMax; // yAxis extreme max
+        var yMin; // yAxis extreme min
// Set the basic plot settings
         var currentSettings = {
             chart: {
                 renderTo: 'querychart',
                 type: 'scatter',
-            //zoomType: 'xy',
-            width:$('#resizer').width() -3,
-                height:$('#resizer').height()-20 
-        },
-        credits: {
-                enabled: false 
+                //zoomType: 'xy',
+                width:$('#resizer').width() - 3,
+                height:$('#resizer').height() - 20
             },
-        exporting: { enabled: false },
+            credits: {
+                enabled: false
+            },
+            exporting: { enabled: false },
             label: { text: $('#dataLabel').val() },
-        plotOptions: {
-            series: {
-                allowPointSelect: true,
+            plotOptions: {
+                series: {
+                    allowPointSelect: true,
                     cursor: 'pointer',
-            showInLegend: false,
+                    showInLegend: false,
                     dataLabels: {
-                        enabled: false,
+                        enabled: false
                     },
-                point: {
+                    point: {
                         events: {
                             click: function() {
-                    var id = this.id;
-                var fid = 4;
-                currentData = id;
-                // Make AJAX request to tbl_zoom_select.php for getting the complete row info
-                var post_params = {
+                                var id = this.id;
+                                var fid = 4;
+                                currentData = id;
+                                // Make AJAX request to tbl_zoom_select.php for getting the complete row info
+                                var post_params = {
                                     'ajax_request' : true,
                                     'get_data_row' : true,
                                     'db' : window.parent.db,
                                     'table' : window.parent.table,
                                     'where_clause' : data[id]['where_clause'],
-                                    'token' : window.parent.token,
-                                }
+                                    'token' : window.parent.token
+                                };
                                 $.post('tbl_zoom_select.php', post_params, function(data) {
-                    // Row is contained in data.row_info, now fill the displayResultForm with row values
-                    for ( key in data.row_info) { 
-                    if (data.row_info[key] == null)
-                        $('#fields_null_id_' + fid).attr('checked', true);
-                    else
-                        $('#fieldID_' + fid).val(data.row_info[key]);
-                    fid++;
-                     }
-                     selectedRow = new Object();
-                     selectedRow = data.row_info;
+                                    // Row is contained in data.row_info, now fill the displayResultForm with row values
+                                    for ( key in data.row_info) {
+                                        if (data.row_info[key] == null) {
+                                            $('#fields_null_id_' + fid).attr('checked', true);
+                                        } else {
+                                            $('#fieldID_' + fid).val(data.row_info[key]);
+                                        }
+                                        fid++;
+                                    }
+                                    selectedRow = new Object();
+                                    selectedRow = data.row_info;
                                 });
-                    $("#dataDisplay").dialog("open");    
-                            },
+                                $("#dataDisplay").dialog("open");
+                            }
                         }
+                    }
                 }
-            }
-        },
-        tooltip: {
-            formatter: function() {
-                return this.point.name;
-            }
-        },
+            },
+            tooltip: {
+                formatter: function() {
+                    return this.point.name;
+                }
+            },
             title: { text: 'Query Results' },
-        xAxis: {
-            title: { text: $('#tableid_0').val() },
-        events: {
-                    setExtremes: function(e){
+            xAxis: {
+                title: { text: $('#tableid_0').val() },
+                events: {
+                    setExtremes: function(e) {
                         this.resetZoom.show();
                     }
                 }
},
             yAxis: {
-        min: null,
-            title: { text: $('#tableid_1').val() },
-        endOnTick: false,
+                min: null,
+                title: { text: $('#tableid_1').val() },
+                endOnTick: false,
                 startOnTick: false,
-        events: {
-                    setExtremes: function(e){
+                events: {
+                    setExtremes: function(e) {
                         this.resetZoom.show();
                     }
                 }
-        },
-        }
+            }
+        };
$('#resizer').resizable({
             resize: function() {
                 currentChart.setSize(
-                    this.offsetWidth -3,
-                    this.offsetHeight -20,
+                    this.offsetWidth - 3,
+                    this.offsetHeight - 20,
                     false
                 );
             }
         });
-        
-    // Classify types as either numeric,time,text
-    xType = getType(xType);
-    yType = getType(yType);
-    //Set the axis type based on the field
-    currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear';
-    currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear';
+        // Classify types as either numeric,time,text
+        xType = getType(xType);
+        yType = getType(yType);
+
+        //Set the axis type based on the field
+        currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear';
+        currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear';
// Formulate series data for plot
         series[0] = new Object();
         series[0].data = new Array();
-    series[0].marker = {
+        series[0].marker = {
             symbol: 'circle'
         };
-    if (xType != 'text' && yType != 'text') {
-        $.each(data,function(key,value) {
-        var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val());
-        var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val());
+        if (xType != 'text' && yType != 'text') {
+            $.each(data, function(key, value) {
+                var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val());
+                var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val());
                 series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } );
-        xCord.push(value[xLabel]);
-        yCord.push(value[yLabel]);
-            it++;   
+                xCord.push(value[xLabel]);
+                yCord.push(value[yLabel]);
+                it++;
             });
-        if(xType == 'numeric') {
-            currentSettings.xAxis.max = Array.max(xCord) + 6
-            currentSettings.xAxis.min = Array.min(xCord) - 6
-        }
-        else {
-            currentSettings.xAxis.labels = { formatter : function() {
-            return getDate(this.value, $('#types_0').val());
-        }}
+            if (xType == 'numeric') {
+                currentSettings.xAxis.max = Array.max(xCord) + 6;
+                currentSettings.xAxis.min = Array.min(xCord) - 6;
+            } else {
+                currentSettings.xAxis.labels = { formatter : function() {
+                    return getDate(this.value, $('#types_0').val());
+                }};
             }
-        if(yType == 'numeric') {
-            currentSettings.yAxis.max = Array.max(yCord) + 6
-            currentSettings.yAxis.min = Array.min(yCord) - 6
-        }
-        else {
-            currentSettings.yAxis.labels = { formatter : function() {
-            return getDate(this.value, $('#types_1').val());
-        }}
+            if (yType == 'numeric') {
+                currentSettings.yAxis.max = Array.max(yCord) + 6;
+                currentSettings.yAxis.min = Array.min(yCord) - 6;
+            } else {
+                currentSettings.yAxis.labels = { formatter : function() {
+                     return getDate(this.value, $('#types_1').val());
+                }};
             }
-        }
-    
-    else if (xType =='text' && yType !='text') {
-        $.each(data,function(key,value) {
-        xCord.push(value[xLabel]);
-        yCord.push(value[yLabel]);
-        });
-        
-        tempX = getCord(xCord);    
-        $.each(data,function(key,value) {
-        var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val());
+        } else if (xType == 'text' && yType != 'text') {
+            $.each(data, function(key, value) {
+                xCord.push(value[xLabel]);
+                yCord.push(value[yLabel]);
+            });
+
+            tempX = getCord(xCord);
+            $.each(data, function(key, value) {
+                var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val());
                 series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } );
-            it++;   
+                it++;
             });
-        
-        currentSettings.xAxis.labels = { formatter : function() {
-            if(tempX[1][this.value] && tempX[1][this.value].length > 10)
-                return tempX[1][this.value].substring(0,10)
-            else 
-            return tempX[1][this.value];
-                } 
-            }
-        if(yType == 'numeric') {
-            currentSettings.yAxis.max = Array.max(yCord) + 6
-            currentSettings.yAxis.min = Array.min(yCord) - 6
-        }
-        else {
-            currentSettings.yAxis.labels = { formatter : function() {
-            return getDate(this.value, $('#types_1').val());
-        }}
+
+            currentSettings.xAxis.labels = {
+                formatter : function() {
+                    if (tempX[1][this.value] && tempX[1][this.value].length > 10) {
+                        return tempX[1][this.value].substring(0, 10);
+                    } else {
+                        return tempX[1][this.value];
+                    }
+                }
+            };
+            if (yType == 'numeric') {
+                currentSettings.yAxis.max = Array.max(yCord) + 6;
+                currentSettings.yAxis.min = Array.min(yCord) - 6;
+            } else {
+                currentSettings.yAxis.labels = {
+                    formatter : function() {
+                        return getDate(this.value, $('#types_1').val());
+                    }
+                };
             }
-        xCord = tempX[2];
-    }
-     
-    else if (xType !='text' && yType =='text') {
-        $.each(data,function(key,value) {
-        xCord.push(value[xLabel]);
-        yCord.push(value[yLabel]);
-        });
-        tempY = getCord(yCord);    
-        $.each(data,function(key,value) {
-        var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val());
+            xCord = tempX[2];
+
+        } else if (xType != 'text' && yType == 'text') {
+            $.each(data, function(key, value) {
+                xCord.push(value[xLabel]);
+                yCord.push(value[yLabel]);
+            });
+            tempY = getCord(yCord);
+            $.each(data, function(key, value) {
+                var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val());
                 series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } );
-            it++;   
+                it++;
             });
-        if(xType == 'numeric') {
-            currentSettings.xAxis.max = Array.max(xCord) + 6
-            currentSettings.xAxis.min = Array.min(xCord) - 6
-        }
-        else {
-            currentSettings.xAxis.labels = { formatter : function() {
-            return getDate(this.value, $('#types_0').val());
-        }}
-            }
-        currentSettings.yAxis.labels = { formatter : function() {
-            if(tempY[1][this.value] && tempY[1][this.value].length > 10)
-                return tempY[1][this.value].substring(0,10)
-            else 
-                    return tempY[1][this.value];
-            }
+            if (xType == 'numeric') {
+                currentSettings.xAxis.max = Array.max(xCord) + 6;
+                currentSettings.xAxis.min = Array.min(xCord) - 6;
+            } else {
+                currentSettings.xAxis.labels = {
+                    formatter : function() {
+                        return getDate(this.value, $('#types_0').val());
+                    }
+                };
             }
-        yCord = tempY[2];
-    }
-    
-    else if (xType =='text' && yType =='text') {
-        $.each(data,function(key,value) {
-        xCord.push(value[xLabel]);
-        yCord.push(value[yLabel]);
-        });
-        tempX = getCord(xCord);    
-        tempY = getCord(yCord);    
-        $.each(data,function(key,value) {
+            currentSettings.yAxis.labels = {
+                formatter : function() {
+                    if (tempY[1][this.value] && tempY[1][this.value].length > 10) {
+                        return tempY[1][this.value].substring(0, 10);
+                    } else {
+                        return tempY[1][this.value];
+                    }
+                }
+            };
+            yCord = tempY[2];
+
+        } else if (xType == 'text' && yType == 'text') {
+            $.each(data, function(key, value) {
+                xCord.push(value[xLabel]);
+                yCord.push(value[yLabel]);
+            });
+            tempX = getCord(xCord);
+            tempY = getCord(yCord);
+            $.each(data, function(key, value) {
                 series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } );
-            it++;   
+                it++;
             });
-        currentSettings.xAxis.labels = { formatter : function() {
-            if(tempX[1][this.value] && tempX[1][this.value].length > 10)
-                return tempX[1][this.value].substring(0,10)
-            else 
-                    return tempX[1][this.value];
-            }
-            }
-        currentSettings.yAxis.labels = { formatter : function() {
-            if(tempY[1][this.value] && tempY[1][this.value].length > 10)
-                return tempY[1][this.value].substring(0,10)
-            else 
-                    return tempY[1][this.value];
-            }
+            currentSettings.xAxis.labels = {
+                formatter : function() {
+                    if (tempX[1][this.value] && tempX[1][this.value].length > 10) {
+                        return tempX[1][this.value].substring(0, 10);
+                    } else {
+                        return tempX[1][this.value];
+                    }
+                }
+            };
+            currentSettings.yAxis.labels = {
+                formatter : function() {
+                    if (tempY[1][this.value] && tempY[1][this.value].length > 10) {
+                        return tempY[1][this.value].substring(0, 10);
+                    } else {
+                        return tempY[1][this.value];
+                    }
+                }
+            };
+            xCord = tempX[2];
+            yCord = tempY[2];
         }
-        xCord = tempX[2];
-        yCord = tempY[2];
-    }
-
-    currentSettings.series = series;
+        currentSettings.series = series;
         currentChart = PMA_createChart(currentSettings);
-    xMin = currentChart.xAxis[0].getExtremes().min;
+        xMin = currentChart.xAxis[0].getExtremes().min;
         xMax = currentChart.xAxis[0].getExtremes().max;
         yMin = currentChart.yAxis[0].getExtremes().min;
         yMax = currentChart.yAxis[0].getExtremes().max;
-    includePan(currentChart); //Enable panning feature
+        includePan(currentChart); //Enable panning feature
         var setZoom = function() {
-        var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2;
-        var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2;
-        var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2;
-        var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2;
-            currentChart.xAxis[0].setExtremes(newxm,newxM);
-            currentChart.yAxis[0].setExtremes(newym,newyM);
-    };
-    //Enable zoom feature
-     $("#querychart").mousewheel(function(objEvent, intDelta) {
+            var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2;
+            var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2;
+            var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2;
+            var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2;
+            currentChart.xAxis[0].setExtremes(newxm, newxM);
+            currentChart.yAxis[0].setExtremes(newym, newyM);
+        };
+
+        //Enable zoom feature
+        $("#querychart").mousewheel(function(objEvent, intDelta) {
             if (intDelta > 0) {
                 if (zoomRatio > 0.1) {
                     zoomRatio = zoomRatio - 0.1;
                     setZoom();
                 }
-            }
-            else if (intDelta < 0) {
+            } else if (intDelta < 0) {
                 zoomRatio = zoomRatio + 0.1;
                 setZoom();
             }
         });
+
         //Add reset zoom feature
         currentChart.yAxis[0].resetZoom = currentChart.xAxis[0].resetZoom = $('<a href="#">Reset zoom</a>')
-        .appendTo(currentChart.container)
-        .css({
-            position: 'absolute',
-            top: 10,
-            right: 20,
-            display: 'none'
-        })
-        .click(function(){
-            currentChart.xAxis[0].setExtremes(null, null)
-            currentChart.yAxis[0].setExtremes(null, null)
-            this.style.display = 'none'
-        });
-    scrollToChart();
+            .appendTo(currentChart.container)
+            .css({
+                position: 'absolute',
+                top: 10,
+                right: 20,
+                display: 'none'
+            })
+            .click(function() {
+                currentChart.xAxis[0].setExtremes(null, null);
+                currentChart.yAxis[0].setExtremes(null, null);
+                this.style.display = 'none';
+            });
+        scrollToChart();
     }
 });
hooks/post-receive
-- 
phpMyAdmin


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19162-g85a990f