From 5ae5ffc6e86a0181799b6f45167bfb57ea91a32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Smodi=C5=A1?= <aless@guru.si>
Date: Fri, 18 Sep 2015 18:39:55 +0200
Subject: Use a link instead of a button in a static hint sequence.

---
 js/codeq/hint.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'js')

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 = $('<div class="hint-static-group"></div>');
-                        jqButton = $('<button type="button">More...</button>'); // TODO: translate "more"
+                        jqButton = $('<a class="hint-static-link"></a>');
                         jqHints.append(jqContainer);
                         N = template.length;
-                        jqContainer.append('<div class="hint-static">' + processTemplate(template[0], args) + '</div>');
+                        tmpl = template[0];
+                        tmplIsObject = (typeof tmpl === 'object') && (tmpl !== null);
+                        jqContainer.append('<div class="hint-static">' + processTemplate((tmplIsObject ? tmpl.message : tmpl) || '', args) + '</div>');
                         jqContainer.append(jqButton);
+                        jqButton.text(tmplIsObject && tmpl.linkText ? tmpl.linkText : 'More...'); // TODO: translate "more"
                         i = 1;
                         jqButton.on('click', function () {
-                            var jqNext = $('<div class="hint-static">' + processTemplate(template[i], args) + '</div>');
+                            var tmpl = template[i],
+                                tmplIsObject = (typeof tmpl === 'object') && (tmpl !== null),
+                                jqNext = $('<div class="hint-static">' + processTemplate((tmplIsObject ? tmpl.message : tmpl) || '', args) + '</div>');
                             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