Merge remote-tracking branch 'origin/master'

phpmyadmin · Oct 31, 2012 · 4b7d934 · 4b7d934
2 parents b7ec0de + 73c04b4
commit 4b7d934
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/js/ajax.js b/js/ajax.js
@@ -155,7 +155,7 @@ var AJAX = {
         }
         // Add a list of menu hashes that we have in the cache to the request
         params += AJAX.cache.menus.getRequestParam();
-        
+
         this._debug && console.log("Loading: " + url); // no need to translate
 
         if (isLink) {
@@ -251,7 +251,7 @@ var AJAX = {
                     .insertAfter('#selflink')
                     .append(data._errors);
             }
-            
+
             if (typeof AJAX._callback === 'function') {
                 AJAX._callback.call();
             }
@@ -446,7 +446,7 @@ AJAX.cache = {
      *
      * @return void
      */
-    goto: function (index) {
+    navigate: function (index) {
         if (typeof this.pages[index] === 'undefined') {
             PMA_ajaxShowMessage(
                 '<div class="error">' + PMA_messages['strInvalidPage'] + '</div>',
@@ -616,7 +616,7 @@ $(function () {
             var index = window.location.hash.substring(
                 8, window.location.hash.indexOf(':')
             );
-            AJAX.cache.goto(index);
+            AJAX.cache.navigate(index);
         }
     });
 });

diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
@@ -380,7 +380,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() {
 
             //Post SQL query to sql.php
             $.post('sql.php', {
-                    'token' : PMA_commonParams('token')
+                    'token' : PMA_commonParams('token'),
                     'db' : PMA_commonParams('db'),
                     'ajax_request' : true,
                     'sql_query' : sql_query,