Changeset 5262

Timestamp:

05/22/14 10:03:17 (10 years ago)

Author:

Twan Goosen

Message:

Merged fix of #561 to 3.0 branch

Location:

vlo/branches/vlo-3.0

Files:

• . (modified) (1 prop)
• CHANGES (modified) (1 diff)
• vlo-web-app (modified) (1 prop)
• vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (modified) (2 diffs)

vlo/branches/vlo-3.0/CHANGES

@@ -4 +4 @@
 * DC-3786 (application type) was added to facet 'resourceClass'
         <https://trac.clarin.eu/ticket/195>
+* Fixed highlighting of search terms that contain unicode characters
+        <https://trac.clarin.eu/ticket/561>
+* Renamed 'permalink' to 'link' 
 
 VLO 3.0 (May 2014)

vlo/branches/vlo-3.0/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js

@@ -6 +6 @@
  http://www.woolyss.free.fr/js/searchhi_Woolyss.js and say when not found */
 /* Modified 20120112 to use the URL instead of referrer */
+/* Modified 20140522 <twan@clarin.eu> replaced unescape() with decodeURIComponent() */
 
 searchhi = {
@@ -66 +67 @@
                 continue;
             if (qsip[0] == 'q' || qsip[0] == 'p') { // q= for Google, p= for Yahoo
-                var wordstring = unescape(qsip[1].replace(/\+/g, ' '));
+                var wordstring = decodeURIComponent(qsip[1].replace(/\+/g, ' '));
                 searchhi.process(wordstring);
             }