CodeQ

From 5ae5ffc6e86a0181799b6f45167bfb57ea91a32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Smodi=C5=A1?= Date: Fri, 18 Sep 2015 18:39:55 +0200 Subject: Use a link instead of a button in a static hint sequence. --- css/codeq/hint.css | 3 +++ index.html | 1 + js/codeq/hint.js | 14 ++++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 css/codeq/hint.css diff --git a/css/codeq/hint.css b/css/codeq/hint.css new file mode 100644 index 0000000..76090b2 --- /dev/null +++ b/css/codeq/hint.css @@ -0,0 +1,3 @@ +a.hint-static-link { + cursor: pointer; +} \ No newline at end of file diff --git a/index.html b/index.html index f7c4252..b9a08ce 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,7 @@ + CodeQ diff --git a/js/codeq/hint.js b/js/codeq/hint.js index c06aef7..55acac9 100644 --- a/js/codeq/hint.js +++ b/js/codeq/hint.js @@ -46,7 +46,7 @@ typeHandlers = { 'static': function (type, template, serverHint) { var args = serverHint.args, - jqContainer, jqButton, i, N; + jqContainer, jqButton, i, N, tmpl, tmplIsObject; if (template instanceof Array) { // unwrap the template if there's only one if (template.length == 0) template = ''; else if (template.length == 1) template = template[0] + ''; // it must be a string @@ -54,17 +54,23 @@ if (template instanceof Array) { codeq.log.debug('Processing an array of static hints'); jqContainer = $('

'); - jqButton = $(''); // TODO: translate "more" + jqButton = $(''); jqHints.append(jqContainer); N = template.length; - jqContainer.append('

' + processTemplate(template[0], args) + '

'); + tmpl = template[0]; + tmplIsObject = (typeof tmpl === 'object') && (tmpl !== null); + jqContainer.append('

' + processTemplate((tmplIsObject ? tmpl.message : tmpl) || '', args) + '

'); jqContainer.append(jqButton); + jqButton.text(tmplIsObject && tmpl.linkText ? tmpl.linkText : 'More...'); // TODO: translate "more" i = 1; jqButton.on('click', function () { - var jqNext = $('

' + processTemplate(template[i], args) + '

'); + var tmpl = template[i], + tmplIsObject = (typeof tmpl === 'object') && (tmpl !== null), + jqNext = $('

' + processTemplate((tmplIsObject ? tmpl.message : tmpl) || '', args) + '

'); i++; if (i < N) { jqButton.before(jqNext); + jqButton.text(tmplIsObject && tmpl.linkText ? tmpl.linkText : 'More...'); // TODO: translate "more" } else { jqButton.remove(); -- cgit v1.2.1