Merge branch 'master' into Basilisk-release

1 files changed, 0 insertions, 22 deletions

diff --git a/application/palemoon/components/preferences/content.js b/application/palemoon/components/preferences/content.js
index 0775c6270..5ae84c2f7 100644
--- a/application/palemoon/components/preferences/content.js
+++ b/application/palemoon/components/preferences/content.js
@@ -38,33 +38,11 @@ var gContentPane = {
    */
   updateMSE: function ()
   {
-    var checkboxMSENFR = document.getElementById('videoMSENFR');
     var checkboxMSEMP4 = document.getElementById('videoMSEMP4');
     var checkboxMSEWebM = document.getElementById('videoMSEWebM');
     var preference = document.getElementById('media.mediasource.enabled');
-    checkboxMSENFR.disabled = preference.value != true;
     checkboxMSEMP4.disabled = preference.value != true;
     checkboxMSEWebM.disabled = preference.value != true;
-    // Check and disable WebM if necessary
-    if (preference.value == true) {
-      this.updateMSEWebM();
-    }
-  },
-
-  /**
-   * Utility function to enable/disable the checkbox for MSE+WebM depending
-   * on the value of media.mediasource.format-reader.
-   */
-  updateMSEWebM: function ()
-  {
-    var checkboxMSEWebM = document.getElementById('videoMSEWebM');
-    var preference = document.getElementById('media.mediasource.format-reader');
-    checkboxMSEWebM.disabled = preference.value == true;
-    if (preference.value == true) {
-      // Switch off incompatible format
-      Services.prefs.setBoolPref('media.mediasource.webm.enabled', false);
-      checkboxMSEWebM.checked = false;
-    }
   },
 
   // BEGIN UI CODE