diff options
author | Cheng-Han, Wu | 2016-04-20 18:11:40 +0800 |
---|---|---|
committer | Cheng-Han, Wu | 2016-04-20 18:11:40 +0800 |
commit | 8bf516263c6582771e7576e8484ca8cfaa8cb9cb (patch) | |
tree | aba81172f554a50466a762db99f25e3650d7ff45 /public/vendor/codemirror/addon/search | |
parent | edc3a31dfdb03e910d7355144280e281eeb582d5 (diff) |
Update CodeMirror to 5.13.5
Diffstat (limited to 'public/vendor/codemirror/addon/search')
-rw-r--r-- | public/vendor/codemirror/addon/search/match-highlighter.js | 2 | ||||
-rw-r--r-- | public/vendor/codemirror/addon/search/search.js | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/public/vendor/codemirror/addon/search/match-highlighter.js b/public/vendor/codemirror/addon/search/match-highlighter.js index 8f02f01c..79218c31 100644 --- a/public/vendor/codemirror/addon/search/match-highlighter.js +++ b/public/vendor/codemirror/addon/search/match-highlighter.js @@ -16,7 +16,7 @@ // highlighted only if the selected text is a word. showToken, when enabled, // will cause the current token to be highlighted when nothing is selected. // delay is used to specify how much time to wait, in milliseconds, before -// highlighting the matches. If annotateScrollbar is enabled, the occurances +// highlighting the matches. If annotateScrollbar is enabled, the occurences // will be highlighted on the scrollbar via the matchesonscrollbar addon. (function(mod) { diff --git a/public/vendor/codemirror/addon/search/search.js b/public/vendor/codemirror/addon/search/search.js index 93e90b36..e6b4f85a 100644 --- a/public/vendor/codemirror/addon/search/search.js +++ b/public/vendor/codemirror/addon/search/search.js @@ -121,7 +121,10 @@ persistentDialog(cm, queryDialog, q, function(query, event) { CodeMirror.e_stop(event); if (!query) return; - if (query != state.queryText) startSearch(cm, state, query); + if (query != state.queryText) { + startSearch(cm, state, query); + state.posFrom = state.posTo = cm.getCursor(); + } if (hiding) hiding.style.opacity = 1 findNext(cm, event.shiftKey, function(_, to) { var dialog @@ -193,7 +196,7 @@ replaceAll(cm, query, text) } else { clearSearch(cm); - var cursor = getSearchCursor(cm, query, cm.getCursor()); + var cursor = getSearchCursor(cm, query, cm.getCursor("from")); var advance = function() { var start = cursor.from(), match; if (!(match = cursor.findNext())) { |