From 0cb861db41fb1494a05b9973a19c41188101e799 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Thu, 14 Apr 2016 22:01:46 -0400
Subject: [PATCH] fix jwilkes/purr-data#26 custom comment width not respected
when editing update css property word-wrap to overflow-wrap
---
pd/nw/css/c64.css | 2 +-
pd/nw/css/default.css | 2 +-
pd/nw/css/extended.css | 2 +-
pd/nw/css/inverted.css | 2 +-
pd/nw/css/strongbad.css | 2 +-
pd/nw/css/subdued.css | 2 +-
pd/nw/css/vanilla.css | 2 +-
pd/nw/css/vanilla_inverted.css | 2 +-
pd/nw/pdgui.js | 3 +--
9 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pd/nw/css/c64.css b/pd/nw/css/c64.css
index 763fbe981..62ee48db4 100644
--- a/pd/nw/css/c64.css
+++ b/pd/nw/css/c64.css
@@ -167,7 +167,7 @@ mark.console_find_highlighted {
color: #a49aea; /* text color */
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/css/default.css b/pd/nw/css/default.css
index 3f8dcba74..5eb65aba7 100644
--- a/pd/nw/css/default.css
+++ b/pd/nw/css/default.css
@@ -267,7 +267,7 @@ mark.console_find_highlighted {
color: black; /* text color */
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/css/extended.css b/pd/nw/css/extended.css
index 39ee722f8..13b0b6cf1 100644
--- a/pd/nw/css/extended.css
+++ b/pd/nw/css/extended.css
@@ -160,7 +160,7 @@ mark.console_find_highlighted {
/* box-shadow: inset 1px 0px 0px 1px #000; */
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/css/inverted.css b/pd/nw/css/inverted.css
index bff32c25d..f604cfce8 100644
--- a/pd/nw/css/inverted.css
+++ b/pd/nw/css/inverted.css
@@ -179,7 +179,7 @@ mark.console_find_highlighted {
color: white; /* text color */
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/css/strongbad.css b/pd/nw/css/strongbad.css
index 0e54235ff..faa38b728 100644
--- a/pd/nw/css/strongbad.css
+++ b/pd/nw/css/strongbad.css
@@ -169,7 +169,7 @@ mark.console_find_highlighted {
color: #4bd046;
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/css/subdued.css b/pd/nw/css/subdued.css
index f6b947225..c6361b71e 100644
--- a/pd/nw/css/subdued.css
+++ b/pd/nw/css/subdued.css
@@ -168,7 +168,7 @@ mark.console_find_highlighted {
/* box-shadow: inset 1px 0px 0px 1px #000; */
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/css/vanilla.css b/pd/nw/css/vanilla.css
index 4669167b0..face35d82 100644
--- a/pd/nw/css/vanilla.css
+++ b/pd/nw/css/vanilla.css
@@ -162,7 +162,7 @@ mark.console_find_highlighted {
/* box-shadow: inset 1px 0px 0px 1px #000; */
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/css/vanilla_inverted.css b/pd/nw/css/vanilla_inverted.css
index 8ae6cbaef..197b5c86b 100644
--- a/pd/nw/css/vanilla_inverted.css
+++ b/pd/nw/css/vanilla_inverted.css
@@ -173,7 +173,7 @@ mark.console_find_highlighted {
color: white; /* text color */
background-color: transparent;
white-space: pre;
- word-wrap: break-word;
+ overflow-wrap: break-word;
-webkit-margin-before: 0px;
}
diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js
index b3b9da0c0..27f3d180f 100644
--- a/pd/nw/pdgui.js
+++ b/pd/nw/pdgui.js
@@ -3556,8 +3556,7 @@ function gui_textarea(cid, tag, type, x, y, width_spec, height_spec, text,
text_line_height_kludge(font_size, "pd") + "px");
p.style.setProperty("transform", "translate(0px, 0px)");
p.style.setProperty("max-width",
- width_spec === 0 || is_gop == 0 ? "60ch" :
- width_spec + "ch");
+ width_spec !== 0 ? width_spec + "ch" : "60ch");
p.style.setProperty("min-width",
width_spec <= 0 ? "3ch" :
(is_gop == 1 ? width_spec + "px" :
--
GitLab