Fix the JS error without breaking existing logic

1 files changed, 15 insertions, 5 deletions

diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 12470675be..28280a1a5d 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -86,14 +86,24 @@ Segmentation = (function($) {
             var title;
             if( current != "")
             {
-                var currentDecoded = piwikHelper.htmlDecode(current);
-                var selector = 'div.segmentList ul li[data-definition="'+currentDecoded+'"]';
+                // this code is mad, and may drive you mad.
+                // the whole segmentation editor needs to be rewritten in AngularJS with clean code
+                var selector = 'div.segmentList ul li[data-definition="'+current+'"]';
                 var foundItems = $(selector, this.target);
 
                 if (foundItems.length === 0) {
-                    currentDecoded = piwikHelper.htmlDecode(decodeURIComponent(current));
-                    selector = 'div.segmentList ul li[data-definition="'+currentDecoded+'"]';
-                    foundItems = $(selector, this.target);
+                    try {
+                        currentDecoded = piwikHelper.htmlDecode(current);
+                        selector = 'div.segmentList ul li[data-definition="'+currentDecoded+'"]';
+                        foundItems = $(selector, this.target);
+                    } catch(e) {}
+                }
+                if (foundItems.length === 0) {
+                    try {
+                        currentDecoded = piwikHelper.htmlDecode(decodeURIComponent(current));
+                        selector = 'div.segmentList ul li[data-definition="'+currentDecoded+'"]';
+                        foundItems = $(selector, this.target);
+                    } catch(e) {}
                 }
 
                 if (foundItems.length > 0) {