Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
40bc3ec5
Commit
40bc3ec5
authored
May 19, 2014
by
Derek Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix a bug that emoticon of <3 and >:) cannot display correctly in the message."
This reverts commit
f7e7d1a6
.
parent
f7e7d1a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
converse.js
converse.js
+2
-2
No files found.
converse.js
View file @
40bc3ec5
...
...
@@ -60,7 +60,6 @@
if
(
this
.
length
>
0
)
{
this
.
each
(
function
(
i
,
obj
)
{
var
text
=
$
(
obj
).
html
();
text
=
text
.
replace
(
/>:
\)
/g
,
'
<span class="emoticon icon-evil"></span>
'
);
text
=
text
.
replace
(
/:
\)
/g
,
'
<span class="emoticon icon-smiley"></span>
'
);
text
=
text
.
replace
(
/:
\-\)
/g
,
'
<span class="emoticon icon-smiley"></span>
'
);
text
=
text
.
replace
(
/;
\)
/g
,
'
<span class="emoticon icon-wink"></span>
'
);
...
...
@@ -72,6 +71,7 @@
text
=
text
.
replace
(
/:p/g
,
'
<span class="emoticon icon-tongue"></span>
'
);
text
=
text
.
replace
(
/:
\-
p/g
,
'
<span class="emoticon icon-tongue"></span>
'
);
text
=
text
.
replace
(
/8
\)
/g
,
'
<span class="emoticon icon-cool"></span>
'
);
text
=
text
.
replace
(
/>:
\)
/g
,
'
<span class="emoticon icon-evil"></span>
'
);
text
=
text
.
replace
(
/:S/g
,
'
<span class="emoticon icon-confused"></span>
'
);
text
=
text
.
replace
(
/:
\\
/g
,
'
<span class="emoticon icon-wondering"></span>
'
);
text
=
text
.
replace
(
/:
\/
/g
,
'
<span class="emoticon icon-wondering"></span>
'
);
...
...
@@ -82,7 +82,7 @@
text
=
text
.
replace
(
/:
\-
O/g
,
'
<span class="emoticon icon-shocked"></span>
'
);
text
=
text
.
replace
(
/
\=\-
O/g
,
'
<span class="emoticon icon-shocked"></span>
'
);
text
=
text
.
replace
(
/
\(\^
.
\^\)
b/g
,
'
<span class="emoticon icon-thumbs-up"></span>
'
);
text
=
text
.
replace
(
/
<
3/g
,
'
<span class="emoticon icon-heart"></span>
'
);
text
=
text
.
replace
(
/
<
3/g
,
'
<span class="emoticon icon-heart"></span>
'
);
$
(
obj
).
html
(
text
);
});
}
...
...
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