git-svn-id: http://xe-core.googlecode.com/svn/trunk@1492 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/context/Context.class.php

@@ -96,6 +96,17 @@
 
             // 상대 경로 설정
             $this->path = $this->getRequestUri();
+
+            // rewrite module때문에 javascript에서 location.href 문제 해결을 위해 직접 실제 경로 설정
+            if($this->get_vars) {
+                foreach($this->get_vars as $key => $val) {
+                    if(!$val) continue;
+                    $url .= ($url?'&':'').$key.'='.$val;
+                }
+                Context::set('current_url',sprintf('%s?%s',$this->path, $url));
+            } else {
+                Context::set('current_url',$this->getUrl());
+            }
         }
 
         /**

common/js/common.js

@@ -8,9 +8,9 @@
  * @brief location.href에서 특정 key의 값을 return
  **/
 String.prototype.getQuery = function(key) {
-    var idx = this.indexOf('?');
+    var idx = current_url.indexOf('?');
     if(idx == -1) return null;
-    var query_string = this.substr(idx+1, this.length);
+    var query_string = current_url.substr(idx+1, current_url.length);
     var args = {}
     query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; });
 
@@ -24,12 +24,12 @@ String.prototype.getQuery = function(key) {
  * @brief location.href에서 특정 key의 값을 return
  **/
 String.prototype.setQuery = function(key, val) {
-    var idx = this.indexOf('?');
+    var idx = current_url.indexOf('?');
-    var uri = this;
+    var uri = current_url;
     uri = uri.replace(/#$/,'');
     if(idx != -1) {
-        uri = this.substr(0, idx);
+        uri = current_url.substr(0, idx);
-        var query_string = this.substr(idx+1, this.length);
+        var query_string = current_url.substr(idx+1, current_url.length);
         var args = new Array();
         query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; });
 

common/tpl/common_layout.html

@@ -19,6 +19,7 @@
     <!--@foreach(Context::getCssFile() as $key => $css_file)--><link rel="stylesheet" href="{$css_file}" type="text/css" />
     <!--@end--><script type="text/javascript">
         var zbxe_url = "{$zbxe_url}";
+        var current_url = "{$current_url}";
     </script>
 
     {Context::getHtmlHeader()}

modules/blog/skins/default/trackback.html

@@ -16,7 +16,7 @@
         </tr>
         <tr>
             <th>{$lang->blog_name}</th>
-            <td><a href="{$val->url}">{$val->blog_name}</a></td>
+            <td><a href="#" onclick="winopen('{$val->url}');return false;">{$val->blog_name}</a></td>
         </tr>
         <tr>
             <th>{$lang->excerpt}</th>

modules/board/skins/default/js/board.js

@@ -125,5 +125,7 @@ function completeDeleteTrackback(ret_obj) {
 function doChangeCategory(sel_obj, url) {
     var category_srl = sel_obj.options[sel_obj.selectedIndex].value;
     if(!category_srl) location.href=url;
-    else location.href=url+'&category='+category_srl;
+    else {
+        location.href = location.href.setQuery('category',category_srl);
+    }
 }

modules/board/skins/default/list.html

@@ -103,7 +103,7 @@
         </select>
         <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
         <input type="submit" value="{$lang->cmd_search}" />
-        <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('search_target','','search_keyword','','page','1','document_srl','')}'"/>
+        <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('','mid',$mid)}';return false;"/>
     </form>
 </div>
 

modules/board/skins/default/trackback.html

@@ -23,7 +23,7 @@
         </tr>
         <tr>
             <th>{$lang->blog_name}</th>
-            <td><a href="{$val->url}">{$val->blog_name}</a></td>
+            <td><a href="#" onclick="winopen('{$val->url}');return false;">{$val->blog_name}</a></td>
         </tr>
         <tr>
             <th>{$lang->excerpt}</th>