diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 11:10:15 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 11:10:15 +0200 |
| commit | 99fe0b710994a063ba0d7408c61fb8e8a1463b9f (patch) | |
| tree | a173fb16ed69669a512fcb63ac227b2987ccb4bb /application/palemoon/components/preferences | |
| parent | cfe5ef4ac7cd59f094b538252161ad74223c47da (diff) | |
| parent | 34fcf334c8dc043088cbf2622279af4f8c495972 (diff) | |
| download | UXP-99fe0b710994a063ba0d7408c61fb8e8a1463b9f.tar UXP-99fe0b710994a063ba0d7408c61fb8e8a1463b9f.tar.gz UXP-99fe0b710994a063ba0d7408c61fb8e8a1463b9f.tar.lz UXP-99fe0b710994a063ba0d7408c61fb8e8a1463b9f.tar.xz UXP-99fe0b710994a063ba0d7408c61fb8e8a1463b9f.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'application/palemoon/components/preferences')
| -rw-r--r-- | application/palemoon/components/preferences/content.js | 22 | ||||
| -rw-r--r-- | application/palemoon/components/preferences/content.xul | 7 |
2 files changed, 1 insertions, 28 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 diff --git a/application/palemoon/components/preferences/content.xul b/application/palemoon/components/preferences/content.xul index 22b6ce229..23d942e45 100644 --- a/application/palemoon/components/preferences/content.xul +++ b/application/palemoon/components/preferences/content.xul @@ -33,10 +33,7 @@ onchange="gContentPane._rebuildFonts();"/> <!-- VIDEO --> - <preference id="media.mediasource.enabled" name="media.mediasource.enabled" type="bool" - onchange="gContentPane.updateMSE();" /> - <preference id="media.mediasource.format-reader" name="media.mediasource.format-reader" type="bool" - onchange="gContentPane.updateMSEWebM();" /> + <preference id="media.mediasource.enabled" name="media.mediasource.enabled" type="bool"/> <preference id="media.mediasource.mp4.enabled" name="media.mediasource.mp4.enabled" type="bool"/> <preference id="media.mediasource.webm.enabled" name="media.mediasource.webm.enabled" type="bool"/> @@ -163,8 +160,6 @@ <checkbox id="videoMSE" preference="media.mediasource.enabled" label="&videoMSE.label;" accesskey="&videoMSE.accesskey;" onsyncfrompreference="gContentPane.updateMSE();"/> - <checkbox class="indent" id="videoMSENFR" preference="media.mediasource.format-reader" - label="&videoMSENFR.label;" accesskey="&videoMSENFR.accesskey;"/> <checkbox class="indent" id="videoMSEMP4" preference="media.mediasource.mp4.enabled" label="&videoMSEMP4.label;" accesskey="&videoMSEMP4.accesskey;"/> <checkbox class="indent" id="videoMSEWebM" preference="media.mediasource.webm.enabled" |