[tor-commits] [torbrowser/maint-2.4] Bug 8312: Let's just remove the disabled barrier entirely.

[mikeperry at torproject.org]

commit 53d13eb61278cc0a357c32b133e5eb51c38feb84
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Sat Mar 2 14:32:42 2013 -0800

    Bug 8312: Let's just remove the disabled barrier entirely.
    
    It is better UX for HTML5 fallback on YouTube.
---
 ...27-Remove-This-plugin-is-disabled-barrier.patch |   46 ++++++++++++++++++++
 ...nk-to-plugin-manager-for-disabled-plugins.patch |   26 -----------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/src/current-patches/firefox/0027-Remove-This-plugin-is-disabled-barrier.patch b/src/current-patches/firefox/0027-Remove-This-plugin-is-disabled-barrier.patch
new file mode 100644
index 0000000..53ecfba
--- /dev/null
+++ b/src/current-patches/firefox/0027-Remove-This-plugin-is-disabled-barrier.patch
@@ -0,0 +1,46 @@
+From cc9807d0dc7907cddfcd4053f26ca6ad01b5a070 Mon Sep 17 00:00:00 2001
+From: Mike Perry <mikeperry-git at torproject.org>
+Date: Thu, 28 Feb 2013 17:41:57 -0800
+Subject: [PATCH 27/27] Remove "This plugin is disabled" barrier.
+
+We do not want to encourage our users to enable plugins at this point.
+
+The barrier also causes bad UX for HTML5 video fallback on YouTube.
+---
+ browser/base/content/browser-plugins.js           |    6 ++++--
+ toolkit/mozapps/plugins/content/pluginProblem.xml |    2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/browser/base/content/browser-plugins.js b/browser/base/content/browser-plugins.js
+index c2abebf..655c2bf 100644
+--- a/browser/base/content/browser-plugins.js
++++ b/browser/base/content/browser-plugins.js
+@@ -228,8 +228,10 @@ var gPluginHandler = {
+         break;
+ 
+       case "PluginDisabled":
+-        let manageLink = doc.getAnonymousElementByAttribute(plugin, "class", "managePluginsLink");
+-        self.addLinkClickCallback(manageLink, "managePlugins");
++        // Screw the disabled message. It messes with HTML5 fallback on YouTube
++        let plugin_overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");
++        if (plugin_overlay != null)
++          plugin_overlay.style.visibility = "hidden";
+         break;
+ 
+       case "PluginScripted":
+diff --git a/toolkit/mozapps/plugins/content/pluginProblem.xml b/toolkit/mozapps/plugins/content/pluginProblem.xml
+index f61cb48..ed83569 100644
+--- a/toolkit/mozapps/plugins/content/pluginProblem.xml
++++ b/toolkit/mozapps/plugins/content/pluginProblem.xml
+@@ -38,7 +38,7 @@
+             <html:div class="installStatus">
+                 <html:div class="msg msgInstallPlugin"><html:a class="installPluginLink" href="">&installPlugin;</html:a></html:div>
+             </html:div>
+-            <html:div class="msg msgManagePlugins"><html:a class="managePluginsLink" href="">&managePlugins;</html:a></html:div>
++            <html:div class="msg msgManagePlugins"><html:a class="managePluginsLink" href=""></html:a></html:div>
+             <html:div class="submitStatus">
+                 <!-- links set at runtime -->
+                 <html:div class="msg msgPleaseSubmit"><html:a class="pleaseSubmitLink" href="">&report.please;</html:a></html:div>
+-- 
+1.7.5.4
+
diff --git a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch b/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch
deleted file mode 100644
index d023cc9..0000000
--- a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 741804b1300397181bc9a9ba03bda2986ae9c726 Mon Sep 17 00:00:00 2001
-From: Mike Perry <mikeperry-git at torproject.org>
-Date: Thu, 28 Feb 2013 17:41:57 -0800
-Subject: [PATCH 27/27] Remove link to plugin manager for disabled plugins.
-
-We do not want to encourage our users to enable plugins at this point.
----
- toolkit/mozapps/plugins/content/pluginProblem.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/toolkit/mozapps/plugins/content/pluginProblem.xml b/toolkit/mozapps/plugins/content/pluginProblem.xml
-index f61cb48..ed83569 100644
---- a/toolkit/mozapps/plugins/content/pluginProblem.xml
-+++ b/toolkit/mozapps/plugins/content/pluginProblem.xml
-@@ -38,7 +38,7 @@
-             <html:div class="installStatus">
-                 <html:div class="msg msgInstallPlugin"><html:a class="installPluginLink" href="">&installPlugin;</html:a></html:div>
-             </html:div>
--            <html:div class="msg msgManagePlugins"><html:a class="managePluginsLink" href="">&managePlugins;</html:a></html:div>
-+            <html:div class="msg msgManagePlugins"><html:a class="managePluginsLink" href=""></html:a></html:div>
-             <html:div class="submitStatus">
-                 <!-- links set at runtime -->
-                 <html:div class="msg msgPleaseSubmit"><html:a class="pleaseSubmitLink" href="">&report.please;</html:a></html:div>
--- 
-1.7.5.4
-