Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
nerrons
purr-data
Commits
1d3b4dd6
Commit
1d3b4dd6
authored
Dec 16, 2016
by
Jonathan Wilkes
Browse files
Merge branch 'aggraef/purr-data-curly-braces-fix'
parents
8df9e7cc
76bb970f
Changes
4
Hide whitespace changes
Inline
Side-by-side
pd/nw/dialog_gatom.html
View file @
1d3b4dd6
...
...
@@ -168,7 +168,7 @@ function substitute_space(arg) {
}
function
strip_problem_chars
(
arg
)
{
var
problem_chars
=
[
"
;
"
,
"
,
"
,
"
{
"
,
"
}
"
,
"
\\
"
];
var
problem_chars
=
[
"
;
"
,
"
,
"
,
"
\\
"
];
var
ret
=
arg
;
for
(
var
i
=
0
;
i
<
problem_chars
.
length
;
i
++
)
{
ret
=
ret
.
split
(
problem_chars
[
i
]).
join
(
""
);
...
...
pd/nw/dialog_iemgui.html
View file @
1d3b4dd6
...
...
@@ -346,7 +346,7 @@ function substitute_space(arg) {
}
function
strip_problem_chars
(
arg
)
{
var
problem_chars
=
[
"
;
"
,
"
,
"
,
"
{
"
,
"
}
"
,
"
\\
"
],
var
problem_chars
=
[
"
;
"
,
"
,
"
,
"
\\
"
],
ret
=
arg
,
i
;
for
(
i
=
0
;
i
<
problem_chars
.
length
;
i
++
)
{
...
...
pd/nw/pd_canvas.js
View file @
1d3b4dd6
...
...
@@ -49,7 +49,6 @@ function text_to_fudi(text) {
text
=
text
.
replace
(
/
(\$[
0-9
]
+
)
/g
,
"
\\
$1
"
);
// escape dollar signs
text
=
text
.
replace
(
/
(\$
@
)
/g
,
"
\\
$@
"
);
// escape special $@ sign
text
=
text
.
replace
(
/
(?!\\)(
,|;
)
/g
,
"
\\
$1
"
);
// escape "," and ";"
text
=
text
.
replace
(
/
\{
|
\}
/g
,
""
);
// filter "{" and "}"
text
=
text
.
replace
(
/
\u
0020+/g
,
"
"
);
// filter consecutive ascii32
return
text
;
}
...
...
pd/src/g_editor.c
View file @
1d3b4dd6
...
...
@@ -4946,7 +4946,7 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
else
gotkeysym
=
gensym
(
"?"
);
//fflag = (av[0].a_type == A_FLOAT ? av[0].a_w.w_float : 0);
keynum
=
(
av
[
1
].
a_type
==
A_FLOAT
?
av
[
1
].
a_w
.
w_float
:
0
);
if
(
keynum
==
'\\'
||
keynum
==
'{'
||
keynum
==
'}'
)
if
(
keynum
==
'\\'
)
{
post
(
"keycode %d: dropped"
,
(
int
)
keynum
);
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment