[Pkg-mozext-commits] [tabmixplus] 63/107: Update links to our help page to open in http://tmp.garyr.net/support/viewpage.php

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit c8813ac2d29f35487abe9c1ec2051aa4790d378d
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Nov 11 10:10:49 2015 +0200

    Update links to our help page to open in http://tmp.garyr.net/support/viewpage.php
---
 chrome/content/preferences/preferences.js                | 8 +++++---
 chrome/content/preferences/session.xul                   | 6 +++---
 chrome/content/preferences/subdialogs/pref-appearance.js | 4 +---
 chrome/content/preferences/subdialogs/pref-filetype.xul  | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/chrome/content/preferences/preferences.js b/chrome/content/preferences/preferences.js
index 5b18bb8..7e097c1 100644
--- a/chrome/content/preferences/preferences.js
+++ b/chrome/content/preferences/preferences.js
@@ -526,7 +526,7 @@ function showPane(paneID) {
 }
 
 function openHelp(helpTopic) {
-  var helpPage = "http://tmp.garyr.net/help/#";
+  var helpPage = "http://tmp.garyr.net/support/viewpage.php?t=3&p=";
   // Check if the help page already open in the top window
   var recentWindow = Tabmix.getTopWin();
   var tabBrowser = recentWindow.gBrowser;
@@ -536,6 +536,7 @@ function openHelp(helpTopic) {
       let browser = browsers[i];
       if (browser.currentURI.spec.startsWith(helpPage)) {
         tabBrowser.tabContainer.selectedIndex = i;
+        browser.tabmix_allowLoad = true;
         return true;
       }
     }
@@ -547,10 +548,11 @@ function openHelp(helpTopic) {
   if (!helpTopic) {
     var currentPane = document.documentElement.currentPane;
     helpTopic = currentPane.helpTopic;
-    if (currentPane.id == "paneSession" && helpTopic == "tabmix")
+    if (currentPane.id == "paneSession") {
       helpTopic = $("session").parentNode.selectedTab.getAttribute("helpTopic");
+    }
   }
-
+  helpTopic = helpTopic.toLowerCase().replace("mouse_-_", "").replace(/_-_|_/g, "-");
   recentWindow.openUILinkIn(helpPage + helpTopic, where);
 }
 
diff --git a/chrome/content/preferences/session.xul b/chrome/content/preferences/session.xul
index 1eecc21..c0c3b89 100644
--- a/chrome/content/preferences/session.xul
+++ b/chrome/content/preferences/session.xul
@@ -145,9 +145,9 @@
             <tabs id="session"
                   onselect="gPrefWindow.tabSelectionChanged(event);">
               <tab label="&sm.StartExit;" class="subtabs tabmix" helpTopic="Session_-_StartExit"/>
-              <tab label="&sm.restore;" class="subtabs tabmix" helpTopic="Session_-_Restore"/>
-              <tab label="tab" class="firefox" helpTopic=" "/>
-              <tab label="&sm.preserve;" class="subtabs tabmix" helpTopic="Session_-_Preserve"/>
+              <tab label="&sm.restore;" class="subtabs tabmix" helpTopic="Session_-_StartExit#Restore"/>
+              <tab label="tab" class="firefox" helpTopic="Session_-_StartExit"/>
+              <tab label="&sm.preserve;" class="subtabs tabmix" helpTopic="Session_-_StartExit#Preserve"/>
             </tabs>
             <tabpanels id="sessionManager-panels" flex="1" class="groupbox-panels">
               <!-- Tabmix Session manager - start/exit -->
diff --git a/chrome/content/preferences/subdialogs/pref-appearance.js b/chrome/content/preferences/subdialogs/pref-appearance.js
index 0c659c3..c41d2e1 100644
--- a/chrome/content/preferences/subdialogs/pref-appearance.js
+++ b/chrome/content/preferences/subdialogs/pref-appearance.js
@@ -36,11 +36,9 @@ var tabstyles = { // jshint ignore:line
   },
 
   openHelp: function() {
-    var subPage = ["Current_Tab", "Unloaded_tabs", "Unread_tabs", "Other_Tabs", "Progress_meter_on_tabs"];
-    var index = $("AppearanceTabBox").selectedIndex;
     var win = window.opener || Tabmix.getTopWin();
     if (win)
-      win.openHelp("Customize_Styles_-_" + subPage[index]);
+      win.openHelp("display-tab#customize_styles");
     else
       document.documentElement.getButton("help").disabled = true;
   },
diff --git a/chrome/content/preferences/subdialogs/pref-filetype.xul b/chrome/content/preferences/subdialogs/pref-filetype.xul
index 86a9a43..b739472 100644
--- a/chrome/content/preferences/subdialogs/pref-filetype.xul
+++ b/chrome/content/preferences/subdialogs/pref-filetype.xul
@@ -14,7 +14,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept,cancel,help"
-        ondialoghelp="window.opener.openHelp('Events_-_links_edit');"
+        ondialoghelp="window.opener.openHelp('links#file-type-editor');"
         title="&filetype.options;"
         onload="Init();"
         ondialogaccept="Save();"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git