| ... |
... |
@@ -501,15 +501,39 @@ Preferences.addSetting({ |
|
501
|
501
|
},
|
|
502
|
502
|
});
|
|
503
|
503
|
|
|
|
504
|
+function determineSuggestionSettingsVisibility() {
|
|
|
505
|
+ if (!lazy.UrlbarPrefs.get("quickSuggestEnabled")) {
|
|
|
506
|
+ return false;
|
|
|
507
|
+ } else if (
|
|
|
508
|
+ lazy.UrlbarPrefs.get("quickSuggestSettingsUi") ==
|
|
|
509
|
+ lazy.QuickSuggest.SETTINGS_UI.NONE
|
|
|
510
|
+ ) {
|
|
|
511
|
+ return false;
|
|
|
512
|
+ }
|
|
|
513
|
+ return true;
|
|
|
514
|
+}
|
|
|
515
|
+
|
|
504
|
516
|
Preferences.addSetting({
|
|
505
|
517
|
id: "firefoxSuggestAll",
|
|
506
|
518
|
pref: "browser.urlbar.suggest.quicksuggest.all",
|
|
|
519
|
+ deps: [
|
|
|
520
|
+ "quickSuggestEnabledPref",
|
|
|
521
|
+ "quickSuggestSettingsUiPref",
|
|
|
522
|
+ "nimbusListener",
|
|
|
523
|
+ ],
|
|
|
524
|
+ visible: determineSuggestionSettingsVisibility,
|
|
507
|
525
|
});
|
|
508
|
526
|
|
|
509
|
527
|
Preferences.addSetting({
|
|
510
|
528
|
id: "firefoxSuggestSponsored",
|
|
511
|
529
|
pref: "browser.urlbar.suggest.quicksuggest.sponsored",
|
|
512
|
|
- deps: ["firefoxSuggestAll"],
|
|
|
530
|
+ deps: [
|
|
|
531
|
+ "firefoxSuggestAll",
|
|
|
532
|
+ "quickSuggestEnabledPref",
|
|
|
533
|
+ "quickSuggestSettingsUiPref",
|
|
|
534
|
+ "nimbusListener",
|
|
|
535
|
+ ],
|
|
|
536
|
+ visible: determineSuggestionSettingsVisibility,
|
|
513
|
537
|
disabled: deps => {
|
|
514
|
538
|
return !deps.firefoxSuggestAll.value;
|
|
515
|
539
|
},
|
| ... |
... |
@@ -525,6 +549,14 @@ Preferences.addSetting({ |
|
525
|
549
|
"nimbusListener",
|
|
526
|
550
|
],
|
|
527
|
551
|
visible: () => {
|
|
|
552
|
+ if (!lazy.UrlbarPrefs.get("quickSuggestEnabled")) {
|
|
|
553
|
+ return false;
|
|
|
554
|
+ } else if (
|
|
|
555
|
+ lazy.UrlbarPrefs.get("quickSuggestSettingsUi") ==
|
|
|
556
|
+ lazy.QuickSuggest.SETTINGS_UI.NONE
|
|
|
557
|
+ ) {
|
|
|
558
|
+ return false;
|
|
|
559
|
+ }
|
|
528
|
560
|
return (
|
|
529
|
561
|
lazy.UrlbarPrefs.get("quickSuggestSettingsUi") ==
|
|
530
|
562
|
lazy.QuickSuggest.SETTINGS_UI.FULL
|
| ... |
... |
@@ -561,6 +593,13 @@ Preferences.addSetting( |
|
561
|
593
|
|
|
562
|
594
|
Preferences.addSetting({
|
|
563
|
595
|
id: "dismissedSuggestionsDescription",
|
|
|
596
|
+ deps: [
|
|
|
597
|
+ "firefoxSuggestAll",
|
|
|
598
|
+ "quickSuggestEnabledPref",
|
|
|
599
|
+ "quickSuggestSettingsUiPref",
|
|
|
600
|
+ "nimbusListener",
|
|
|
601
|
+ ],
|
|
|
602
|
+ visible: determineSuggestionSettingsVisibility,
|
|
564
|
603
|
});
|
|
565
|
604
|
|
|
566
|
605
|
const ENGINE_FLAVOR = "text/x-moz-search-engine";
|