diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
| commit | 27d59016d35ae84d89e8d09bdadb1c3a89ac3f22 (patch) | |
| tree | f493da0591281db183c23c86ecc3dc078009cafa /doc/src/template/scripts/functions.js | |
| parent | b92a7337d47e8b1be2d65d5a726f7a6f291a65bb (diff) | |
| parent | 5d3b132dd94f6c985fa3f9584dedb46823acddfe (diff) | |
| download | Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.zip Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.gz Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.bz2 | |
Merge remote branch 'origin/4.7' into qml-4.7
Conflicts:
examples/declarative/modelviews/webview/transparent.qml
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); } |