webhelp - some small rackspace additions, and cleaning up of main.js

diff --git a/xsl/webhelp/template/common/main.js b/xsl/webhelp/template/common/main.js
index 3a8b9a30683dad8dbce65d9cc18878cffe2493d0..35415cd60841241405be1a239235662161e2cc9c 100644 (file)
--- a/xsl/webhelp/template/common/main.js
+++ b/xsl/webhelp/template/common/main.js
@@ -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 @@ $(document).ready(function() {
     $(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 @@ function syncToc() {
             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 syncToc() {
  */
 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 @@ function showHideToc() {
         //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 @@ function showHideToc() {
     } 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 @@ function toggleHighlight() {
     } else {
         searchHighlight($.cookie('textToSearch'));
     }
-}
+}
\ No newline at end of file

diff --git a/xsl/webhelp/template/content/search/nwSearchFnt.js b/xsl/webhelp/template/content/search/nwSearchFnt.js
index ba802d22458e873e9831ab54e8acb077a0d40144..c00a0305656e333d92e62cf725ece8699b0b2d77 100644 (file)
--- a/xsl/webhelp/template/content/search/nwSearchFnt.js
+++ b/xsl/webhelp/template/content/search/nwSearchFnt.js
@@ -37,10 +37,11 @@ txt_please_wait = "Please wait. Search in progress...";
 txt_results_for = "Results for: ";\r
 //-------------------------OXYGEN PATCH END-------------------------\r
 \r
-/* Cette fonction verifie la validite de la recherche entrre par l utilisateur */\r
-function Verifie(ditaSearch_Form) {\r
+/* This function verify the validity of search input by the user\r
+  Cette fonction verifie la validite de la recherche entrre par l utilisateur */\r
+function Verifie(searchForm) {\r
 \r
-    // Check browser compatibitily\r
+    // Check browser compatibility\r
     if (navigator.userAgent.indexOf("Konquerer") > -1) {\r
 \r
         alert(txt_browser_not_supported);\r
@@ -48,28 +49,18 @@ function Verifie(ditaSearch_Form) {
     }\r
 \r
     //-------------------------OXYGEN PATCH START-------------------------\r
-    /*\r
-    var expressionInput = document.ditaSearch_Form.textToSearch.value\r
-    */\r
     searchTextField = trim(document.searchForm.textToSearch.value);\r
-       var expressionInput = searchTextField;  \r
-\r
-\r
+       var expressionInput = searchTextField;\r
     $.cookie('textToSearch', expressionInput);\r
-\r
     //-------------------------OXYGEN PATCH END-------------------------\r
 \r
-\r
     if (expressionInput.length < 1) {\r
 \r
         // expression is invalid\r
         alert(txt_enter_at_least_1_char);\r
         // reactive la fenetre de search (utile car cadres)\r
 \r
-        //-------------------------OXYGEN PATCH START-------------------------\r
-        /*\r
-        document.ditaSearch_Form.textToSearch.focus();\r
-        */\r
+        //-------------------------OXYGEN PATCH START------------------------\r
         document.searchForm.textToSearch.focus();\r
         //-------------------------OXYGEN PATCH END-------------------------\r
     }\r
@@ -113,9 +104,6 @@ function Verifie(ditaSearch_Form) {
              // OXYGEN PATCH END - EXM-20996\r
                Effectuer_recherche(expressionInput);\r
                // reactive la fenetre de search (utile car cadres)\r
-               /*\r
-               document.ditaSearch_Form.textToSearch.focus();\r
-               */\r
                document.searchForm.textToSearch.focus();        \r
                //-------------------------OXYGEN PATCH END-------------------------\r
        }\r
@@ -141,7 +129,9 @@ function Effectuer_recherche(expressionInput) {
     var txt_wordsnotfound = "";\r
 \r
 \r
-    /*nqu: expressionInput, la recherche est lower cased, plus remplacement des char speciaux*/\r
+    /* expressionInput, search input is lower cased, plus replacement of special chars\r
+    * nqu: expressionInput, la recherche est lower cased, plus remplacement des char speciaux\r
+    * */\r
     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_");\r
 \r
     searchFor = searchFor.replace(/  +/g, " ");\r
@@ -151,11 +141,7 @@ function Effectuer_recherche(expressionInput) {
     wordsList.sort();\r
 \r
     //set the tokenizing method\r
-    if(typeof indexerLanguage != "undefined" && (indexerLanguage=="zh" || indexerLanguage=="ja" ||indexerLanguage=="ko")){\r
-        useCJKTokenizing=true;\r
-    } else {\r
-        useCJKTokenizing=false;\r
-    }\r
+    useCJKTokenizing = typeof indexerLanguage != "undefined" && (indexerLanguage == "zh" || indexerLanguage == "ja" || indexerLanguage == "ko");\r
     //If Lucene CJKTokenizer was used as the indexer, then useCJKTokenizing will be true. Else, do normal tokenizing.\r
     // 2-gram tokenizinghappens in CJKTokenizing, \r
     // OXYGEN PATCH START. If doStem then make tokenize with Stemmer\r