diff options
| author | Nina Vyedin <nina.vyedin@gmail.com> | 2013-03-05 06:38:20 +0400 |
|---|---|---|
| committer | Nina Vyedin <nina.vyedin@gmail.com> | 2013-03-05 07:57:22 +0400 |
| commit | 125860389f506ee16bd691a207ed32fddb1dd3b8 (patch) | |
| tree | 42a34e25a34fe9187718c6b9b9f80475f1043646 | |
| parent | a65a114791286a8a183e2593c901cee4f8ed1b69 (diff) | |
[webdoc] refactoring for the search plugin
| -rw-r--r-- | webdoc/plugins/search-plugin/fastsearch/search.js | 14 | ||||
| -rw-r--r-- | webdoc/plugins/search-plugin/fullsearch/search.html | 6 |
2 files changed, 5 insertions, 15 deletions
diff --git a/webdoc/plugins/search-plugin/fastsearch/search.js b/webdoc/plugins/search-plugin/fastsearch/search.js index cbd253c7..e246efbe 100644 --- a/webdoc/plugins/search-plugin/fastsearch/search.js +++ b/webdoc/plugins/search-plugin/fastsearch/search.js @@ -1,18 +1,8 @@ var search_input = $('#fsearch'); var search_window = $('#fsearch_window'); -var content_frame = $('#content_frame'); -var page_link = $('#pageLink'); var lis = null; var page_top_offset = $('#main_part').offset().top; -change_page = function (pagename) { - content_frame.attr ('src', 'monodoc.ashx?link=' + pagename); - page_link.attr ('href', '?link=' + pagename); - if (window.history && window.history.pushState) - window.history.pushState (null, '', '/?link=' + pagename); -}; -page_link.attr ('href', document.location.search); - var is_shown = false; var hide = function () { if (!is_shown) @@ -29,7 +19,7 @@ var show = function () { var param = document.URL.split('#')[1]; if(param) { - $('#content_frame').attr('src', 'search.html#' + param); + $('#content_frame').attr('src', '/plugins/search-plugin/fullsearch/search.html#' + param); } search_input.blur (function () { @@ -107,7 +97,7 @@ search_input.keydown (function (event) { selected.children ('a').click (); } else { // Show full search page - content_frame.attr('src', 'search.html#' + encodeURI(search_input.val ())); + $("#content_frame").attr('src', '/plugins/search-plugin/fullsearch/search.html#' + encodeURI(search_input.val ())); } hide (); search_input.blur (); diff --git a/webdoc/plugins/search-plugin/fullsearch/search.html b/webdoc/plugins/search-plugin/fullsearch/search.html index 83c4a485..7b9424be 100644 --- a/webdoc/plugins/search-plugin/fullsearch/search.html +++ b/webdoc/plugins/search-plugin/fullsearch/search.html @@ -1,7 +1,7 @@ <html> <head> <title></title> - <link rel="stylesheet" type="text/css" href="plugins/search-plugin/fullsearch/search.css" /> + <link rel="stylesheet" type="text/css" href="search.css" /> </head> <script type="text/javascript"> function printFrame() { @@ -16,9 +16,9 @@ <div id="s_header"><h1>Search result(s) for '<span id="s_term"></span>'</h1></div> <div id="s_results"><ul></ul></div> <div id="s_morebtn"><input type="button" value="Show more results"></div> - <div id="s_spinner" class="hidden"><img src="/images/spinner.gif" alt="spinner" /></div> + <div id="s_spinner" class="hidden"><img src="/plugins/search-plugin/images/spinner.gif" alt="spinner" /></div> </div> <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> - <script type="text/javascript" src="plugins/search-plugin/fullsearch/fullsearch.js"></script> + <script type="text/javascript" src="fullsearch.js"></script> </body> </html> |