gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1667 from nisargjhaveri/col_hint

Browse Source 
Show hint for column autocomplete in better way
This commit is contained in:
Marc Delisle 2015-05-09 07:18:38 -04:00
commit c6276ce151
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/functions.js
View File

@ -1763,6 +1763,16 @@ function codemirrorAutocompleteOnInputRead(instance) {
'server': PMA_commonParams.get('server'),
'db': PMA_commonParams.get('db')
};
var columnHintRender = function(elem, self, data) {
$('<div class="autocomplete-column-name">')
.text(data.columnName)
.appendTo(elem);
$('<div class="autocomplete-column-hint">')
.text(data.columnHint)
.appendTo(elem);
}
$.ajax({
type: 'POST',
url: href,
@ -1781,7 +1791,7 @@ function codemirrorAutocompleteOnInputRead(instance) {
};
for (var column in columns) {
if (columns.hasOwnProperty(column)) {
var displayText = column + ' | ' + columns[column].Type;
var displayText = columns[column].Type;
if (columns[column].Key == 'PRI') {
displayText += ' | Primary';
} else if (columns[column].Key == 'UNI') {
@ -1789,7 +1799,10 @@ function codemirrorAutocompleteOnInputRead(instance) {
}
table.columns.push({
text: column,
displayText: displayText
displayText: column + " | " + displayText,
columnName: column,
columnHint: displayText,
render: columnHintRender
});
}
}

11
themes/pmahomme/css/codemirror.css.php
View File

@ -309,6 +309,17 @@ span.cm-number {
color: teal;
}
.autocomplete-column-name {
display: inline-block;
}
.autocomplete-column-hint {
display: inline-block;
float: right;
color: #666;
margin-left: 1em;
}
/* CodeMirror Hints styling */
.CodeMirror-hints {
position: absolute;