Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHincu Petru <hincupetru@gmail.com>2014-04-01 00:24:47 +0400
committerHincu Petru <hincupetru@gmail.com>2014-04-01 00:24:47 +0400
commit552310796c137d10d06dea2ddf252688cfdd72eb (patch)
treeaa288e860ee34cf9a3f9e9b343ea761c232ce41f /app/assets/javascripts/app/helpers/text_formatter.js
parentb2070774058ae07f1526b233b1431f4281c36bdd (diff)
Catch error from decodeURI for prevent crash in posts parsing
Diffstat (limited to 'app/assets/javascripts/app/helpers/text_formatter.js')
-rw-r--r--app/assets/javascripts/app/helpers/text_formatter.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js
index d5ae68444..9f27029c6 100644
--- a/app/assets/javascripts/app/helpers/text_formatter.js
+++ b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -45,9 +45,12 @@ $(function() {
}
// url*DE*code as much as possible
- while( unicodeUrl.indexOf("%") !== -1 && unicodeUrl != decodeURI(unicodeUrl) ) {
- unicodeUrl = decodeURI(unicodeUrl);
+ try {
+ while( unicodeUrl.indexOf("%") !== -1 && unicodeUrl != decodeURI(unicodeUrl) ) {
+ unicodeUrl = decodeURI(unicodeUrl);
+ }
}
+ catch(e){}
// markdown doesn't like '(' or ')' anywhere, except where it wants
var workingUrl = unicodeUrl.replace(/\(/, "%28").replace(/\)/, "%29");