summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-05-03 11:23:52 +0300
committerAlon Levy <alon@pobox.com>2015-05-03 11:23:52 +0300
commita2a5bed122b257fdeeec0dec2cee09b93c8eb58f (patch)
tree384f3d9bb9a3fb687ebb46e13ee1db7ea00d904d /src/client
parentf6cd61e623ec8da8b826e4b61c23dfd915813521 (diff)
client: search: clear on doc change. Fixes #532
Diffstat (limited to 'src/client')
-rw-r--r--src/client/rz_core.js11
-rw-r--r--src/client/view/search.js5
2 files changed, 15 insertions, 1 deletions
diff --git a/src/client/rz_core.js b/src/client/rz_core.js
index 4b5099c9..376031c7 100644
--- a/src/client/rz_core.js
+++ b/src/client/rz_core.js
@@ -3,6 +3,16 @@
define(['jquery', 'd3', 'consts', 'rz_bus', 'util', 'model/graph', 'model/core', 'view/item_info', 'rz_observer', 'view/selection', 'rz_mesh', 'model/diff', "view/graph_view", 'view/svg_input', 'view/filter_menu'],
function($, d3, consts, rz_bus, util, model_graph, model_core, item_info, rz_observer, selection, rz_mesh, model_diff, graph_view, svg_input, filter_menu) {
+// fix circular module dependency
+var search;
+function get_search()
+{
+ if (search === undefined) {
+ search = require('view/search');
+ }
+ return search;
+}
+
var addednodes = [],
vis,
graphinterval = 0,
@@ -273,6 +283,7 @@ function rzdoc__open(rzdoc_name) {
edit_graph.clear();
main_graph.load_from_backend();
set_title(rzdoc_name);
+ get_search().clear();
var rzdoc_bar = $('#rzdoc-bar_doc-label');
var rzdoc_bar__doc_lable = $('#rzdoc-bar_doc-label');
diff --git a/src/client/view/search.js b/src/client/view/search.js
index 35edd8e7..c68f5098 100644
--- a/src/client/view/search.js
+++ b/src/client/view/search.js
@@ -67,11 +67,14 @@ function init() {
}
-
+function clear() {
+ search.val('');
+}
return {
focus: focus,
init: init,
+ clear: clear,
};
}
);