Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Side by Side Diff: chrome/browser/resources/history.html

Issue 42215: Fix escaping issue with non-ASCII history search input.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html id="t" jsvalues="dir:textdirection;"> 2 <html id="t" jsvalues="dir:textdirection;">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title jscontent="title"></title> 5 <title jscontent="title"></title>
6 <script type="text/javascript"> 6 <script type="text/javascript">
7 /////////////////////////////////////////////////////////////////////////////// 7 ///////////////////////////////////////////////////////////////////////////////
8 // Globals: 8 // Globals:
9 var RESULTS_PER_PAGE = 150; 9 var RESULTS_PER_PAGE = 150;
10 var MAX_SEARCH_DEPTH_MONTHS = 18; 10 var MAX_SEARCH_DEPTH_MONTHS = 18;
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 }; 636 };
637 637
638 if (!window.location.hash) { 638 if (!window.location.hash) {
639 return result; 639 return result;
640 } 640 }
641 641
642 var hashSplit = window.location.hash.substr(1).split("&"); 642 var hashSplit = window.location.hash.substr(1).split("&");
643 for (var i = 0; i < hashSplit.length; i++) { 643 for (var i = 0; i < hashSplit.length; i++) {
644 var pair = hashSplit[i].split("="); 644 var pair = hashSplit[i].split("=");
645 if (pair.length > 1) { 645 if (pair.length > 1) {
646 result[pair[0]] = unescape(pair[1]); 646 result[pair[0]] = decodeURIComponent(pair[1]);
647 } 647 }
648 } 648 }
649 649
650 return result; 650 return result;
651 } 651 }
652 652
653 /** 653 /**
654 * Set the hash to a specified state, this will create an entry in the 654 * Set the hash to a specified state, this will create an entry in the
655 * session history so the back button cycles through hash states, which 655 * session history so the back button cycles through hash states, which
656 * are then picked up by our listener. 656 * are then picked up by our listener.
(...skipping 12 matching lines...) Expand all
669 669
670 /** 670 /**
671 * Static method to get the hash string for a specified state 671 * Static method to get the hash string for a specified state
672 * @param {string} term The current search string. 672 * @param {string} term The current search string.
673 * @param {string} page The page currently being viewed. 673 * @param {string} page The page currently being viewed.
674 * @return {string} The string to be used in a hash. 674 * @return {string} The string to be used in a hash.
675 */ 675 */
676 PageState.getHashString = function(term, page) { 676 PageState.getHashString = function(term, page) {
677 var newHash = []; 677 var newHash = [];
678 if (term) { 678 if (term) {
679 newHash.push("q=" + escape(term)); 679 newHash.push("q=" + encodeURIComponent(term));
680 } 680 }
681 if (page) { 681 if (page) {
682 newHash.push("p=" + page); 682 newHash.push("p=" + page);
683 } 683 }
684 684
685 return newHash.join("&"); 685 return newHash.join("&");
686 } 686 }
687 687
688 /////////////////////////////////////////////////////////////////////////////// 688 ///////////////////////////////////////////////////////////////////////////////
689 // Document Functions: 689 // Document Functions:
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 <span id="searchresultsfor" jscontent="searchresultsfor">Search results for '% s'</span> 928 <span id="searchresultsfor" jscontent="searchresultsfor">Search results for '% s'</span>
929 <span id="history" jscontent="history">History</span> 929 <span id="history" jscontent="history">History</span>
930 <span id="cont" jscontent="cont">(cont.)</span> 930 <span id="cont" jscontent="cont">(cont.)</span>
931 <span id="noresults" jscontent="noresults">No results</span> 931 <span id="noresults" jscontent="noresults">No results</span>
932 <span id="noitems" jscontent="noitems">No items</span> 932 <span id="noitems" jscontent="noitems">No items</span>
933 <span id="deleteday" jscontent="deleteday">Delete history for this day</span> 933 <span id="deleteday" jscontent="deleteday">Delete history for this day</span>
934 <span id="deletedaywarning" jscontent="deletedaywarning">Are you sure you want to delete this day?</span> 934 <span id="deletedaywarning" jscontent="deletedaywarning">Are you sure you want to delete this day?</span>
935 </div> 935 </div>
936 </body> 936 </body>
937 </html> 937 </html>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698