diff options
author | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
commit | 3fb36b36de90068db241cc21184a8ac3b899ad2d (patch) | |
tree | 22490e313f1415681ddfb35f1b0ea0dca8f94ac6 /doc/src/template/scripts/functions.js | |
parent | d11e3d6e327677e828918de3173732116976fbe4 (diff) | |
parent | f34f4ea2d35b92631e98a772e02a1b77ce26681e (diff) | |
download | Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.zip Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.gz Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/template/scripts/functions.js')
-rwxr-xr-x | doc/src/template/scripts/functions.js | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index 58a0248..2723ff2 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -104,9 +104,9 @@ function processNokiaData(response){ } - if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');} - if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');} - if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');} + if(lookupCount == 0){$('#ul001').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');} + if(articleCount == 0){$('#ul002').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');} + if(exampleCount == 0){$('#ul003').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');} // reset count variables; lookupCount=0; articleCount = 0; @@ -160,7 +160,8 @@ else var searchString = $('#pageType').val() ; if ((searchString == null) || (searchString.length < 3)) { $('#pageType').removeClass('loading'); - $('.liveResult').remove(); // replaces removeResults(); + $('.liveResult').remove(); + $('.searching').remove(); CheckEmptyAndLoadList(); $('.report').remove(); // debug$('.content').prepend('<li>too short or blank</li>'); // debug @@ -169,9 +170,7 @@ else if (this.timer) clearTimeout(this.timer); this.timer = setTimeout(function () { $('#pageType').addClass('loading'); - // debug$('.content').prepend('<li>new search started </li>');// debug - // debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug - + $('.list ul').prepend('<li class="menuAlert searching">Searching...</li>'); $.ajax({ contentType: "application/x-www-form-urlencoded", url: 'http://' + location.host + '/nokiasearch/GetDataServlet', @@ -180,9 +179,9 @@ else type: 'post', success: function (response, textStatus) { - $('.liveResult').remove(); // replaces removeResults(); + $('.liveResult').remove(); $('#pageType').removeClass('loading'); - + $('.list ul').prepend('<li class="menuAlert searching">Searching...</li>'); processNokiaData(response); } |