Bug 1362587 - Prevent triggering plugin infobar (workaround bug 1319105)

diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
index 86d4773f244edb85752d8cd97cd59680c1079689..94b9d57fcbb51624801999c260c63d4587fe084c 100644 (file)
--- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
@@ -53,7 +53,6 @@
     "extensions/BugModal/web/bug_modal.js",
     "extensions/BugModal/web/comments.js",
     "extensions/BugModal/web/dropdown.js",
-    "extensions/BugModal/web/ZeroClipboard/ZeroClipboard.min.js",
     "js/bugzilla-readable-status-min.js",
     "js/field.js",
     "js/comments.js",

diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js
index 27d8eb01baae683fc588efd41678918b9651ec0f..5a04709ecba3233b5036bab5c562e3ed84f7ae52 100644 (file)
--- a/extensions/BugModal/web/bug_modal.js
+++ b/extensions/BugModal/web/bug_modal.js
@@ -324,25 +324,30 @@ $(function() {
                 hasFlash = localStorage.getItem('hasFlash');
             }
             if (hasFlash) {
-                ZeroClipboard.config({ flashLoadTimeout: 5000 });
-                var zero = new ZeroClipboard($('#copy-summary'));
-                zero.on({
-                    'ready': function(event) {
-                        $('#copy-summary').show();
-                        localStorage.setItem('hasFlash', true);
-                    },
-                    'error': function(event) {
-                        console.log(event.message);
-                        zero.destroy();
-                        $('#global-zeroclipboard-html-bridge').remove();
-                        $('#copy-summary').hide();
-                        localStorage.removeItem('hasFlash');
-                    },
-                    'copy': function(event) {
-                        var clipboard = event.clipboardData;
-                        clipboard.setData('text/plain', clipboardSummary());
-                    }
-                });
+                var s = document.createElement("script");
+                s.onload = function () {
+                  ZeroClipboard.config({ flashLoadTimeout: 5000 });
+                  var zero = new ZeroClipboard($('#copy-summary'));
+                  zero.on({
+                      'ready': function(event) {
+                          $('#copy-summary').show();
+                          localStorage.setItem('hasFlash', true);
+                      },
+                      'error': function(event) {
+                          console.log(event.message);
+                          zero.destroy();
+                          $('#global-zeroclipboard-html-bridge').remove();
+                          $('#copy-summary').hide();
+                          localStorage.removeItem('hasFlash');
+                      },
+                      'copy': function(event) {
+                          var clipboard = event.clipboardData;
+                          clipboard.setData('text/plain', clipboardSummary());
+                      }
+                  });
+                };
+                s.src = "extensions/BugModal/web/ZeroClipboard/ZeroClipboard.min.js";
+                document.getElementsByTagName('head')[0].appendChild(s);
             }
         }
     }