From dbfafd96ec9a478af2b09c362006cd3b3ca396dc Mon Sep 17 00:00:00 2001
From: vfilippov <vfilippov@6955db30-a419-402b-8a0d-67ecbb4d7f56>
Date: Tue, 4 Aug 2009 17:37:52 +0000
Subject: [PATCH] =?UTF-8?q?Bug=2040933=20Some=20more=20escape()'s=20replac?=
 =?UTF-8?q?ed=20by=20encodeURI()'s=20(=D0=B1=D1=8B=D0=BB=D0=B8=20=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BA=D0=BE=D0=B7=D1=8F=D0=B1=D1=80=D1=8B=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=D0=B7=D0=B0=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=B8=D0=B7=20test=20run'?=
 =?UTF-8?q?=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@220 6955db30-a419-402b-8a0d-67ecbb4d7f56
---
 template/en/default/bug/create/create.html.tmpl |  4 ++--
 testopia/js/caserun.js                          |  2 +-
 testopia/js/util.js                             | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 2c2890c0f..879594cc8 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -516,7 +516,7 @@ TUI_hide_default('expert_fields');
         <br>
         <p style="text-align: left" id="showpreviewbtn"><a href="javascript:void showcommentpreview()">Preview</a></p>
         <div id="wrapcommentpreview" style="display: none">
-        <iframe id="commentpreview" style="height: auto; border-width: 0; width: 100%">
+        <iframe name="commentpreview" id="commentpreview" style="height: auto; border-width: 0; width: 100%">
         </iframe>
         <script>
         /*<!--*/
@@ -527,7 +527,7 @@ TUI_hide_default('expert_fields');
         function showcommentpreview() {
             document.getElementById('wrapcommentpreview').style.width=(document.Create.comment.offsetWidth-10)+'px';
             document.getElementById('wrapcommentpreview').style.display='table-cell';
-            document.getElementById('commentpreview').src='page.cgi?id=previewcomment.html&comment='+escape(document.Create.comment.value);
+            window.frames['commentpreview'].location.replace('page.cgi?id=previewcomment.html&comment='+encodeURI(document.Create.comment.value));
             document.getElementById('showpreviewbtn').style.display='none';
         }
         //-->
diff --git a/testopia/js/caserun.js b/testopia/js/caserun.js
index 8874dfc8a..fc2bb68c8 100644
--- a/testopia/js/caserun.js
+++ b/testopia/js/caserun.js
@@ -1516,7 +1516,7 @@ CaseBugsGrid = function(id){
         store.on('load',function(){
             var url = 'enter_bug.cgi?';
             for (var i=0; i<store.fields.keys.length; i++){
-                url = url + store.fields.keys[i] + '=' + escape(store.getAt(0).get(store.fields.keys[i])) + '&';
+                url = url + store.fields.keys[i] + '=' + encodeURI(store.getAt(0).get(store.fields.keys[i])) + '&';
             }
             url = url + 'caserun_id=' + caserun_id;
             window.open(url);
diff --git a/testopia/js/util.js b/testopia/js/util.js
index bfd9975c8..d3a83b63c 100644
--- a/testopia/js/util.js
+++ b/testopia/js/util.js
@@ -1601,15 +1601,15 @@ searchToJson = function(url){
         var pair = pairs[i].split('=');
         if (params[pair[0]]){
             if (typeof params[pair[0]] == 'object'){
-                params[pair[0]].push(unescape(pair[1]));
+                params[pair[0]].push(decodeURI(pair[1]));
             }
             else{
                 params[pair[0]] = new Array(params[pair[0]]);
-                params[pair[0]].push(unescape(pair[1]));
+                params[pair[0]].push(decodeURI(pair[1]));
             }
         }
         else{
-            params[pair[0]] = unescape(pair[1]);
+            params[pair[0]] = decodeURI(pair[1]);
         }
     }
 
@@ -1624,11 +1624,11 @@ jsonToSearch = function(params, searchStr, drops){
         }
         if (typeof params[key] == 'object'){
             for(i=0; i<params[key].length; i++){
-                searchStr = searchStr + key + '=' + escape(params[key][i]) + '&';
+                searchStr = searchStr + key + '=' + encodeURI(params[key][i]) + '&';
             }
         }
         else{
-            searchStr = searchStr + key + '=' + escape(params[key]) + '&';
+            searchStr = searchStr + key + '=' + encodeURI(params[key]) + '&';
         }
     }
     if (searchStr.lastIndexOf('&') == searchStr.length - 1){