Release build 6.10.0 [ci release]

duckduckgo · Aug 23, 2024 · f25bfc9 · f25bfc9
1 parent 47cb478
commit f25bfc9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/Sources/ContentScopeScripts/dist/contentScope.js b/Sources/ContentScopeScripts/dist/contentScope.js
@@ -3025,7 +3025,10 @@
           forcedValues["user-scalable"] = "yes";
           forcedValues["maximum-scale"] = 10;
         }
-        if (!viewportTag || this.desktopModeEnabled) {
+        if (this.getFeatureSettingEnabled("plainTextViewPort") && document.contentType === "text/plain") {
+          forcedValues.width = "device-width";
+          forcedValues["initial-scale"] = 1;
+        } else if (!viewportTag || this.desktopModeEnabled) {
           forcedValues.width = screen.width >= 1280 ? 1280 : 980;
           forcedValues["initial-scale"] = (screen.width / forcedValues.width).toFixed(3);
           forcedValues["user-scalable"] = "yes";

diff --git a/build/android/contentScope.js b/build/android/contentScope.js
@@ -8416,7 +8416,12 @@
                 forcedValues['maximum-scale'] = 10;
             }
 
-            if (!viewportTag || this.desktopModeEnabled) {
+            if (this.getFeatureSettingEnabled('plainTextViewPort') && document.contentType === 'text/plain') {
+                // text should span the full screen width
+                forcedValues.width = 'device-width';
+                // keep default scale to prevent text from appearing too small
+                forcedValues['initial-scale'] = 1;
+            } else if (!viewportTag || this.desktopModeEnabled) {
                 // force wide viewport width
                 forcedValues.width = screen.width >= 1280 ? 1280 : 980;
                 forcedValues['initial-scale'] = (screen.width / forcedValues.width).toFixed(3);

diff --git a/build/contentScope.js b/build/contentScope.js
@@ -14792,7 +14792,12 @@
                 forcedValues['maximum-scale'] = 10;
             }
 
-            if (!viewportTag || this.desktopModeEnabled) {
+            if (this.getFeatureSettingEnabled('plainTextViewPort') && document.contentType === 'text/plain') {
+                // text should span the full screen width
+                forcedValues.width = 'device-width';
+                // keep default scale to prevent text from appearing too small
+                forcedValues['initial-scale'] = 1;
+            } else if (!viewportTag || this.desktopModeEnabled) {
                 // force wide viewport width
                 forcedValues.width = screen.width >= 1280 ? 1280 : 980;
                 forcedValues['initial-scale'] = (screen.width / forcedValues.width).toFixed(3);

diff --git a/build/integration/contentScope.js b/build/integration/contentScope.js
@@ -14792,7 +14792,12 @@
                 forcedValues['maximum-scale'] = 10;
             }
 
-            if (!viewportTag || this.desktopModeEnabled) {
+            if (this.getFeatureSettingEnabled('plainTextViewPort') && document.contentType === 'text/plain') {
+                // text should span the full screen width
+                forcedValues.width = 'device-width';
+                // keep default scale to prevent text from appearing too small
+                forcedValues['initial-scale'] = 1;
+            } else if (!viewportTag || this.desktopModeEnabled) {
                 // force wide viewport width
                 forcedValues.width = screen.width >= 1280 ? 1280 : 980;
                 forcedValues['initial-scale'] = (screen.width / forcedValues.width).toFixed(3);

diff --git a/src/features/web-compat.js b/src/features/web-compat.js
@@ -635,7 +635,12 @@ export class WebCompat extends ContentFeature {
             forcedValues['maximum-scale'] = 10
         }
 
-        if (!viewportTag || this.desktopModeEnabled) {
+        if (this.getFeatureSettingEnabled('plainTextViewPort') && document.contentType === 'text/plain') {
+            // text should span the full screen width
+            forcedValues.width = 'device-width'
+            // keep default scale to prevent text from appearing too small
+            forcedValues['initial-scale'] = 1
+        } else if (!viewportTag || this.desktopModeEnabled) {
             // force wide viewport width
             forcedValues.width = screen.width >= 1280 ? 1280 : 980
             forcedValues['initial-scale'] = (screen.width / forcedValues.width).toFixed(3)