The branch, master has been updated
       via  12237ed84ff6549c6dbc1bc4640b320fd6184304 (commit)
       via  88104eac669c8a5064179985bf41194f4e91c3f8 (commit)
      from  19dd8f292885ca6adc284b6c0977cb3ccfff20d3 (commit)


- Log -----------------------------------------------------------------
commit 12237ed84ff6549c6dbc1bc4640b320fd6184304
Author: Michal Čihař <[email protected]>
Date:   Fri Aug 19 13:10:49 2011 +0200

    Remove no longer used Help funciton

commit 88104eac669c8a5064179985bf41194f4e91c3f8
Author: Michal Čihař <[email protected]>
Date:   Fri Aug 19 13:10:33 2011 +0200

    Fix js to match changes

-----------------------------------------------------------------------

Summary of changes:
 js/pmd/move.js |   45 ++++++++++++++++++++-------------------------
 1 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/js/pmd/move.js b/js/pmd/move.js
index eb2b246..6f30293 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -159,8 +159,8 @@ function MouseMove(e)
     }
 
     if (ON_relation || ON_display_field) {
-        document.getElementById('hint').style.left = (Glob_X + 20) + 'px';
-        document.getElementById('hint').style.top  = (Glob_Y + 20) + 'px';
+        document.getElementById('pmd_hint').style.left = (Glob_X + 20) + 'px';
+        document.getElementById('pmd_hint').style.top  = (Glob_Y + 20) + 'px';
     }
 
     if (layer_menu_cur_click) {
@@ -225,7 +225,7 @@ function Main()
     Canvas_pos();
     Small_tab_refresh();
     Re_load();
-    id_hint = document.getElementById('hint');
+    id_hint = document.getElementById('pmd_hint');
     if (isIE) {
         General_scroll();
     }
@@ -535,12 +535,12 @@ function Start_relation()
     if (!ON_relation) {
         document.getElementById('foreign_relation').style.display = '';
         ON_relation = 1;
-        document.getElementById('hint').innerHTML = 
PMA_messages['strSelectReferencedKey'];
-        document.getElementById('hint').style.visibility = "visible";
+        document.getElementById('pmd_hint').innerHTML = 
PMA_messages['strSelectReferencedKey'];
+        document.getElementById('pmd_hint').style.visibility = "visible";
         document.getElementById('rel_button').className = 
'M_butt_Selected_down';
     } else {
-        document.getElementById('hint').innerHTML = "";
-        document.getElementById('hint').style.visibility = "hidden";
+        document.getElementById('pmd_hint').innerHTML = "";
+        document.getElementById('pmd_hint').style.visibility = "hidden";
         document.getElementById('rel_button').className = 'M_butt';
         click_field = 0;
         ON_relation = 0;
@@ -561,7 +561,7 @@ function Click_field(T, f, PK) // table field
             }
             click_field = 1;
             link_relation = "T1=" + T + "&F1=" + f;
-            document.getElementById('hint').innerHTML = 
PMA_messages['strSelectForeignKey'];
+            document.getElementById('pmd_hint').innerHTML = 
PMA_messages['strSelectForeignKey'];
         } else {
             Start_relation(); // hidden hint...
             if (j_tabs[db + '.' + T] != '1' || !PK) {
@@ -596,8 +596,8 @@ function Click_field(T, f, PK) // table field
             display_field[T] = f;
         }
         ON_display_field = 0;
-        document.getElementById('hint').innerHTML = "";
-        document.getElementById('hint').style.visibility = "hidden";
+        document.getElementById('pmd_hint').innerHTML = "";
+        document.getElementById('pmd_hint').style.visibility = "hidden";
         document.getElementById('display_field_button').className = 'M_butt';
         makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' 
+ server + '&db=' + db + '&token=' + token);
     }
@@ -868,11 +868,6 @@ function No_have_constr(id_this)
     }
 }
 
-function Help()
-{
-    var WinHelp = window.open("pmd_help.php", "wind1", 
"top=200,left=400,width=300,height=200,resizable=yes,scrollbars=yes,menubar=no");
-}
-
 function PDF_save()
 {
     // var WinPDF =
@@ -955,16 +950,16 @@ function Start_display_field()
     }
     if (!ON_display_field) {
         ON_display_field = 1;
-        document.getElementById('hint').innerHTML = 
PMA_messages['strChangeDisplay'];
-        document.getElementById('hint').style.visibility = "visible";
+        document.getElementById('pmd_hint').innerHTML = 
PMA_messages['strChangeDisplay'];
+        document.getElementById('pmd_hint').style.visibility = "visible";
         document.getElementById('display_field_button').className = 
'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA
 
         if (isIE) { // correct for IE
             document.getElementById('display_field_button').className = 
'M_butt_Selected_down_IE';
         }
     } else {
-        document.getElementById('hint').innerHTML = "";
-        document.getElementById('hint').style.visibility = "hidden";
+        document.getElementById('pmd_hint').innerHTML = "";
+        document.getElementById('pmd_hint').style.visibility = "hidden";
         document.getElementById('display_field_button').className = 'M_butt';
         ON_display_field = 0;
     }
@@ -1136,8 +1131,8 @@ function add_object()
     var init = history_array.length;
     if (rel.value != '--') {
         if (document.getElementById('Query').value == "") {
-            document.getElementById('hint').innerHTML = "value/subQuery is 
empty" ;
-            document.getElementById('hint').style.visibility = "visible";
+            document.getElementById('pmd_hint').innerHTML = "value/subQuery is 
empty" ;
+            document.getElementById('pmd_hint').style.visibility = "visible";
             return;
         }
         var p = document.getElementById('Query');
@@ -1168,8 +1163,8 @@ function add_object()
     }
     if (document.getElementById('h_rel_opt').value != '--') {
         if (document.getElementById('having').value == "") {
-            document.getElementById('hint').innerHTML = "value/subQuery is 
empty" ;
-            document.getElementById('hint').style.visibility = "visible";
+            document.getElementById('pmd_hint').innerHTML = "value/subQuery is 
empty" ;
+            document.getElementById('pmd_hint').style.visibility = "visible";
            return;
         }
         var p = document.getElementById('having');
@@ -1186,8 +1181,8 @@ function add_object()
         document.getElementById('orderby').checked = false;
         //make orderby
     }
-    document.getElementById('hint').innerHTML = sum + "object created" ;
-    document.getElementById('hint').style.visibility = "visible";
+    document.getElementById('pmd_hint').innerHTML = sum + "object created" ;
+    document.getElementById('pmd_hint').style.visibility = "visible";
     //output sum new objects created
     var existingDiv = document.getElementById('ab');
     existingDiv.innerHTML = display(init,history_array.length);


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to