From: <ka...@us...> - 2011-10-02 06:38:25
|
Revision: 9105 http://docbook.svn.sourceforge.net/docbook/?rev=9105&view=rev Author: kasunbg Date: 2011-10-02 06:38:19 +0000 (Sun, 02 Oct 2011) Log Message: ----------- webhelp - some small rackspace additions, and cleaning up of main.js Modified Paths: -------------- trunk/xsl/webhelp/template/common/main.js trunk/xsl/webhelp/template/content/search/nwSearchFnt.js Modified: trunk/xsl/webhelp/template/common/main.js =================================================================== --- trunk/xsl/webhelp/template/common/main.js 2011-10-02 05:44:22 UTC (rev 9104) +++ trunk/xsl/webhelp/template/common/main.js 2011-10-02 06:38:19 UTC (rev 9105) @@ -5,19 +5,10 @@ * */ -var treesettings = { - collapsed: true, - animated: "medium", - control: "#sidetreecontrol", - persist: "cookie" -}; - //Turn ON and OFF the animations for Show/Hide Sidebar. Extend this to other anime as well if any. var noAnimations=false; $(document).ready(function() { - - // When you click on a link to an anchor, scroll down // 105 px to cope with the fact that the banner // hides the top 95px or so of the page. @@ -43,15 +34,19 @@ $(function() { $("#tabs").tabs({ cookie: { - // store cookie for 2 days. - expires: 2 + expires: 2 // store cookie for 2 days. } }); }); //Generate the tree $("#ulTreeDiv").attr("style", ""); - $("#tree").treeview(treesettings); + $("#tree").treeview({ + collapsed: true, + animated: "medium", + control: "#sidetreecontrol", + persist: "cookie" + }); //after toc fully styled, display it. Until loading, a 'loading' image will be displayed $("#tocLoading").attr("style", "display:none;"); @@ -133,7 +128,7 @@ if (style != null && !style.match(/background-color: Background;/)) { a.setAttribute("style", "background-color: #D8D8D8; " + style); b.setAttribute("style", "color: black;"); - } else if (style != null || style != "") { + } else if (style != null) { a.setAttribute("style", "background-color: #D8D8D8; " + style); b.setAttribute("style", "color: black;"); } else { @@ -192,7 +187,7 @@ */ function showHideToc() { var showHideButton = $("#showHideButton"); - var leftNavigation = $("#sidebar"); + var leftNavigation = $("#sidebar"); //hide the parent div of leftnavigation, ie sidebar var content = $("#content"); var animeTime=75 @@ -200,10 +195,10 @@ //Hide TOC showHideButton.removeClass('pointLeft').addClass('pointRight'); - if(noAnimations) { - leftNavigation.css("display", "none"); - content.css("margin", "125px 0 0 0"); - } else { + if(noAnimations) { + leftNavigation.css("display", "none"); + content.css("margin", "125px 0 0 0"); + } else { leftNavigation.hide(animeTime); content.animate( { "margin-left": 0 }, animeTime); } @@ -211,10 +206,10 @@ } else { //Show the TOC showHideButton.removeClass('pointRight').addClass('pointLeft'); - if(noAnimations) { + if(noAnimations) { content.css("margin", "125px 0 0 280px"); leftNavigation.css("display", "block"); - } else { + } else { content.animate( { "margin-left": '280px' }, animeTime); leftNavigation.show(animeTime); } @@ -265,4 +260,4 @@ } else { searchHighlight($.cookie('textToSearch')); } -} +} \ No newline at end of file Modified: trunk/xsl/webhelp/template/content/search/nwSearchFnt.js =================================================================== --- trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2011-10-02 05:44:22 UTC (rev 9104) +++ trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2011-10-02 06:38:19 UTC (rev 9105) @@ -37,10 +37,11 @@ txt_results_for = "Results for: "; //-------------------------OXYGEN PATCH END------------------------- -/* Cette fonction verifie la validite de la recherche entrre par l utilisateur */ -function Verifie(ditaSearch_Form) { +/* This function verify the validity of search input by the user + Cette fonction verifie la validite de la recherche entrre par l utilisateur */ +function Verifie(searchForm) { - // Check browser compatibitily + // Check browser compatibility if (navigator.userAgent.indexOf("Konquerer") > -1) { alert(txt_browser_not_supported); @@ -48,28 +49,18 @@ } //-------------------------OXYGEN PATCH START------------------------- - /* - var expressionInput = document.ditaSearch_Form.textToSearch.value - */ searchTextField = trim(document.searchForm.textToSearch.value); - var expressionInput = searchTextField; - - + var expressionInput = searchTextField; $.cookie('textToSearch', expressionInput); - //-------------------------OXYGEN PATCH END------------------------- - if (expressionInput.length < 1) { // expression is invalid alert(txt_enter_at_least_1_char); // reactive la fenetre de search (utile car cadres) - //-------------------------OXYGEN PATCH START------------------------- - /* - document.ditaSearch_Form.textToSearch.focus(); - */ + //-------------------------OXYGEN PATCH START------------------------ document.searchForm.textToSearch.focus(); //-------------------------OXYGEN PATCH END------------------------- } @@ -113,9 +104,6 @@ // OXYGEN PATCH END - EXM-20996 Effectuer_recherche(expressionInput); // reactive la fenetre de search (utile car cadres) - /* - document.ditaSearch_Form.textToSearch.focus(); - */ document.searchForm.textToSearch.focus(); //-------------------------OXYGEN PATCH END------------------------- } @@ -141,7 +129,9 @@ var txt_wordsnotfound = ""; - /*nqu: expressionInput, la recherche est lower cased, plus remplacement des char speciaux*/ + /* expressionInput, search input is lower cased, plus replacement of special chars + * nqu: expressionInput, la recherche est lower cased, plus remplacement des char speciaux + * */ searchFor = expressionInput.toLowerCase().replace(/<\//g, "_st_").replace(/\$_/g, "_di_").replace(/\.|%2C|%3B|%21|%3A|@|\/|\*/g, " ").replace(/(%20)+/g, " ").replace(/_st_/g, "</").replace(/_di_/g, "%24_"); searchFor = searchFor.replace(/ +/g, " "); @@ -151,11 +141,7 @@ wordsList.sort(); //set the tokenizing method - if(typeof indexerLanguage != "undefined" && (indexerLanguage=="zh" || indexerLanguage=="ja" ||indexerLanguage=="ko")){ - useCJKTokenizing=true; - } else { - useCJKTokenizing=false; - } + useCJKTokenizing = typeof indexerLanguage != "undefined" && (indexerLanguage == "zh" || indexerLanguage == "ja" || indexerLanguage == "ko"); //If Lucene CJKTokenizer was used as the indexer, then useCJKTokenizing will be true. Else, do normal tokenizing. // 2-gram tokenizinghappens in CJKTokenizing, // OXYGEN PATCH START. If doStem then make tokenize with Stemmer This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2012-05-25 15:41:14
|
Revision: 9380 http://docbook.svn.sourceforge.net/docbook/?rev=9380&view=rev Author: kasunbg Date: 2012-05-25 15:41:03 +0000 (Fri, 25 May 2012) Log Message: ----------- Remove unnecessary bits of code from webhelp Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/template/content/search/nwSearchFnt.js Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2012-05-25 03:42:24 UTC (rev 9379) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2012-05-25 15:41:03 UTC (rev 9380) @@ -191,8 +191,6 @@ p.breadcrumbs a:hover {text-decoration: underline;} -/* OXYGEN ADDITION FOR SEARCH RESULT RATING */ - #star ul.star { LIST-STYLE: none; MARGIN: 0; @@ -368,4 +366,4 @@ margin: 0 0 0 0; } -} \ No newline at end of file +} Modified: trunk/xsl/webhelp/template/content/search/nwSearchFnt.js =================================================================== --- trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2012-05-25 03:42:24 UTC (rev 9379) +++ trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2012-05-25 15:41:03 UTC (rev 9380) @@ -12,7 +12,6 @@ var htmlfileinfoList = "htmlFileInfoList.js"; var useCJKTokenizing = false; -//-------------------------OXYGEN PATCH START------------------------- var w = new Object(); var scoring = new Object(); @@ -35,7 +34,6 @@ txt_browser_not_supported = "Your browser is not supported. Use of Mozilla Firefox is recommended."; txt_please_wait = "Please wait. Search in progress..."; txt_results_for = "Results for: "; -//-------------------------OXYGEN PATCH END------------------------- /* This function verify the validity of search input by the user Cette fonction verifie la validite de la recherche entrre par l utilisateur */ @@ -48,12 +46,10 @@ return; } - //-------------------------OXYGEN PATCH START------------------------- searchTextField = trim(document.searchForm.textToSearch.value); - searchTextField = searchTextField.replace(/['"]/g,''); + searchTextField = searchTextField.replace(/['"]/g,''); var expressionInput = searchTextField; $.cookie('textToSearch', expressionInput); - //-------------------------OXYGEN PATCH END------------------------- if (expressionInput.length < 1) { @@ -61,13 +57,9 @@ alert(txt_enter_at_least_1_char); // reactive la fenetre de search (utile car cadres) - //-------------------------OXYGEN PATCH START------------------------ document.searchForm.textToSearch.focus(); - //-------------------------OXYGEN PATCH END------------------------- } else { - //-------------------------OXYGEN PATCH START------------------------- - // OXYGEN PATCH START - EXM-20996 - split by " ", ".", ":", "-" var splitSpace = searchTextField.split(" "); var splitWords = []; for (var i = 0 ; i < splitSpace.length ; i++) { @@ -85,7 +77,6 @@ } } noWords = splitWords; - // OXYGEN PATCH END - EXM-20996 - split by " ", ".", ":", "-" if (noWords.length > 9){ // Allow to search maximum 10 words alert(txt_enter_more_than_10_words); @@ -97,16 +88,13 @@ document.searchForm.textToSearch.focus(); } else { // Effectuer la recherche - // OXYGEN PATCH START - EXM-20996 expressionInput = ''; for (var x = 0 ; x < noWords.length ; x++) { expressionInput = expressionInput + " " + noWords[x]; } - // OXYGEN PATCH END - EXM-20996 Effectuer_recherche(expressionInput); // reactive la fenetre de search (utile car cadres) document.searchForm.textToSearch.focus(); - //-------------------------OXYGEN PATCH END------------------------- } } } @@ -129,8 +117,8 @@ var fileAndWordList = new Array(); var txt_wordsnotfound = ""; - - // -------------------------------------- + + // -------------------------------------- // Begin Thu's patch /*nqu: expressionInput, la recherche est lower cased, plus remplacement des char speciaux*/ //The original replacement expression is: @@ -141,8 +129,8 @@ searchFor = expressionInput.toLowerCase().replace(/<\//g, "_st_").replace(/\$_/g, "_di_").replace(/%2C|%3B|%21|%3A|@|\/|\*/g, " ").replace(/(%20)+/g, " ").replace(/_st_/g, "</").replace(/_di_/g, "%24_"); //If it ends with a period, replace it with a space - searchFor = searchFor.replace(/[.]$/,""); - // End Thu's Patch + searchFor = searchFor.replace(/[.]$/,""); + // End Thu's Patch // ------------------------------------------ searchFor = searchFor.replace(/ +/g, " "); @@ -155,10 +143,9 @@ useCJKTokenizing = typeof indexerLanguage != "undefined" && (indexerLanguage == "zh" || indexerLanguage == "ja" || indexerLanguage == "ko"); //If Lucene CJKTokenizer was used as the indexer, then useCJKTokenizing will be true. Else, do normal tokenizing. // 2-gram tokenizinghappens in CJKTokenizing, - // OXYGEN PATCH START. If doStem then make tokenize with Stemmer + //If doStem then make tokenize with Stemmer var finalArray; if (doStem){ - // OXYGEN PATCH END. if(useCJKTokenizing){ finalWordsList = cjkTokenize(wordsList); finalArray = finalWordsList; @@ -180,8 +167,8 @@ * Compare with the indexed words (in the w[] array), and push words that are in it to tempTab. */ var tempTab = new Array(); - - // --------------------------------------- + + // --------------------------------------- // Thu's patch //Do not use associative array in for loop, for example: //for(var t in finalWordsList) @@ -199,19 +186,19 @@ } finalWordsList = tempTab; //Check all the inputs to see if the root words are in the finalWordsList, if not add them there - var inputs = expressionInput.split(' '); - // Thu's Patch + var inputs = expressionInput.split(' '); + // Thu's Patch // ------------------------------------------- - //-------------------------OXYGEN PATCH START----------------------- + txt_wordsnotfound = expressionInput; finalWordsList = removeDuplicate(finalWordsList); - //-------------------------OXYGEN PATCH END------------------------- + } if (finalWordsList.length) { //search 'and' and 'or' one time fileAndWordList = SortResults(finalWordsList); - //-------------------------OXYGEN PATCH START----------------------- + if (fileAndWordList == undefined){ var cpt = 0; } else { @@ -227,32 +214,32 @@ } } - //-------------------------OXYGEN PATCH END----------------------- + for (var i = 0; i < cpt; i++) { - //-------------------------OXYGEN PATCH START----------------------- + var hundredProcent = fileAndWordList[i][0].scoring + 100 * fileAndWordList[i][0].motsnb; var ttScore_first = fileAndWordList[i][0].scoring; var numberOfWords = fileAndWordList[i][0].motsnb; - //-------------------------OXYGEN PATCH END----------------------- + if (fileAndWordList[i] != undefined) { linkTab.push("<p>" + txt_results_for + " " + "<span class=\"searchExpression\">" + fileAndWordList[i][0].motslisteDisplay + "</span>" + "</p>"); linkTab.push("<ul class='searchresult'>"); for (t in fileAndWordList[i]) { //linkTab.push("<li><a href=\"../"+fl[fileAndWordList[i][t].filenb]+"\">"+fl[fileAndWordList[i][t].filenb]+"</a></li>"); - //-------------------------OXYGEN PATCH START----------------------- + var ttInfo = fileAndWordList[i][t].filenb; // Get scoring var ttScore = fileAndWordList[i][t].scoring; var tempInfo = fil[ttInfo]; - //-------------------------OXYGEN PATCH END----------------------- + var pos1 = tempInfo.indexOf("@@@"); var pos2 = tempInfo.lastIndexOf("@@@"); var tempPath = tempInfo.substring(0, pos1); var tempTitle = tempInfo.substring(pos1 + 3, pos2); var tempShortdesc = tempInfo.substring(pos2 + 3, tempInfo.length); - //-------------------------OXYGEN PATCH START------------------------- + // toc.html will not be displayed on search result if (tempPath == 'toc.html'){ continue; @@ -295,11 +282,11 @@ */ // Also check if we have a valid description if ((tempShortdesc != "null" && tempShortdesc != '...')) { - //-------------------------OXYGEN PATCH END------------------------- + linkString += "\n<div class=\"shortdesclink\">" + tempShortdesc + "</div>"; } linkString += "</li>"; - //-------------------------OXYGEN PATCH START------------------------- + // Add rating values for scoring at the list of matches linkString += "<div id=\"rightDiv\">"; linkString += "<div id=\"star\">"; @@ -313,7 +300,7 @@ linkString += "</div>"; linkString += "</div>"; //linkString += '<b>Rating: ' + ttScore + '</b>'; - //-------------------------OXYGEN PATCH END------------------------- + linkTab.push(linkString); no++; } @@ -335,7 +322,7 @@ results = "<p>" + localeresource.search_no_results + " <span class=\"searchExpression\">" + txt_wordsnotfound + "</span>" + "</p>"; } - //-------------------------OXYGEN PATCH START------------------------- + // Verify if the browser is Google Chrome and the WebHelp is used on a local machine // If browser is Google Chrome and WebHelp is used on a local machine a warning message will appear // Highlighting will not work in this conditions. There is 2 workarounds @@ -344,10 +331,10 @@ } else { document.getElementById('searchResults').innerHTML = warningMsg + results; } - //-------------------------OXYGEN PATCH END------------------------- + } -//-------------------------OXYGEN PATCH START------------------------- + // Verify if the stemmed word is aproximately the same as the searched word function verifyWord(word, arr){ for (var i = 0 ; i < arr.length ; i++){ @@ -375,13 +362,13 @@ } return toReturn.length > 0 ? toReturn : undefined; } -//-------------------------OXYGEN PATCH END------------------------- + function tokenize(wordsList){ var stemmedWordsList = new Array(); // Array with the words to look for after removing spaces - var cleanwordsList = new Array(); // Array with the words to look for - // ------------------------------------------------- - // Thu's patch + var cleanwordsList = new Array(); // Array with the words to look for + // ------------------------------------------------- + // Thu's patch for(var j=0;j<wordsList.length;++j){ var word = wordsList[j]; var originalWord=word; @@ -421,8 +408,8 @@ else{ stemmedWordsList.push(cleanwordsList[i]); } - } - // End Thu's patch + } + // End Thu's patch // ------------------------------------------- } else { stemmedWordsList = cleanwordsList; @@ -670,7 +657,7 @@ return null; } - //-------------------------OXYGEN PATCH START------------------------- + // In generated js file we add scoring at the end of the word // Example word1*scoringForWord1,word2*scoringForWord2 and so on // Split after * to obtain the right values @@ -807,23 +794,20 @@ this.filesNo = filesNo; this.wordList = wordList; } -//-------------------------OXYGEN PATCH END------------------------- - -// Object. -// Oxygen. Add a new parameter. Scoring. +// Add a new parameter. Scoring. function resultPerFile(filenb, motsliste, motsnb, motslisteDisplay, scoring, group) { //10 - spring,time - 2 - spring, time - 55 - 3 this.filenb = filenb; this.motsliste = motsliste; this.motsnb = motsnb; this.motslisteDisplay= motslisteDisplay; - //-------------------------OXYGEN PATCH START------------------------- + this.scoring = scoring; - //-------------------------OXYGEN PATCH END------------------------- + } -//-------------------------OXYGEN PATCH START------------------------- + function findRating(words, nr){ var sum = 0; var xx = words.split(','); @@ -838,7 +822,7 @@ } return sum; } -//-------------------------OXYGEN PATCH END------------------------- + function compare_nbMots(s1, s2) { var t1 = s1.split(','); var t2 = s2.split(','); @@ -852,7 +836,7 @@ } //return t1.length - t2.length); } -//-------------------------OXYGEN PATCH START------------------------- + // return false if browser is Google Chrome and WebHelp is used on a local machine, not a web server function verifyBrowser(){ var returnedValue = true; @@ -895,5 +879,3 @@ chars = chars || "\\s"; return str.replace(new RegExp("[" + chars + "]+$", "g"), ""); } - -//-------------------------OXYGEN PATCH END------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |